diff --git a/README.md b/README.md index 6e860f69e..ee6c5a15e 100644 --- a/README.md +++ b/README.md @@ -71,9 +71,9 @@ youlai-mall ├── mall-sms # 营销服务(Sales Management Service) ├── sms-api # 营销服务-Feign客户端 ├── sms-boot # 营销服务-启动应用 -├── mall-pms # 商品服务(Product Management Service) - ├── pms-api # 商品服务-Feign客户端 - ├── pms-boot # 商品服务-启动应用 +├── mall-product # 商品服务(Product Management Service) + ├── product-api # 商品服务-Feign客户端 + ├── product-boot # 商品服务-启动应用 ├── mall-oms # 订单服务(Order Management Service) ├── oms-api # 订单服务-Feign客户端 ├── oms-boot # 订单服务-启动应用 diff --git a/docs/sql/mysql5/youlai_system.sql b/docs/sql/mysql5/youlai_system.sql index 3d84182f2..b2e7701da 100644 --- a/docs/sql/mysql5/youlai_system.sql +++ b/docs/sql/mysql5/youlai_system.sql @@ -111,15 +111,15 @@ INSERT INTO `sys_menu` VALUES (5, 1, 1, '部门管理', 'dept', 'system/dept/ind INSERT INTO `sys_menu` VALUES (6, 1, 1, '字典管理', 'dict', 'system/dict/index', NULL, 'dict', 5, 1, NULL, NULL, NULL, 1, '2021-08-28 09:12:21', '2021-08-28 09:12:21'); INSERT INTO `sys_menu` VALUES (9, 0, 2, '营销管理', '/sms', 'Layout', NULL, 'number', 5, 1, NULL, NULL, NULL, NULL, '2021-08-28 09:12:21', '2021-08-28 09:12:21'); INSERT INTO `sys_menu` VALUES (10, 9, 1, '广告列表', 'advert', 'sms/advert/index', NULL, 'advert', 1, 1, NULL, NULL, NULL, 1, '2021-08-28 09:12:21', '2021-08-28 09:12:21'); -INSERT INTO `sys_menu` VALUES (11, 0, 1, '商品管理', '/pms', 'Layout', NULL, 'el-icon-Goods', 2, 1, '/pms/goods', '0', NULL, 1, '2021-08-28 09:12:21', '2024-03-03 23:54:35'); -INSERT INTO `sys_menu` VALUES (12, 11, 1, '商品列表', 'goods', 'pms/goods/index', NULL, 'goods-list', 1, 1, NULL, NULL, NULL, 1, '2021-08-28 09:12:21', '2021-08-28 09:12:21'); +INSERT INTO `sys_menu` VALUES (11, 0, 1, '商品管理', '/product', 'Layout', NULL, 'el-icon-Goods', 2, 1, '/product/goods', '0', NULL, 1, '2021-08-28 09:12:21', '2024-03-03 23:54:35'); +INSERT INTO `sys_menu` VALUES (12, 11, 1, '商品列表', 'goods', 'product/goods/index', NULL, 'goods-list', 1, 1, NULL, NULL, NULL, 1, '2021-08-28 09:12:21', '2021-08-28 09:12:21'); INSERT INTO `sys_menu` VALUES (13, 0, 2, '订单管理', '/oms', 'Layout', NULL, 'el-icon-ShoppingCart', 3, 1, '/oms/order', '0', 1, 1, '2021-08-28 09:12:21', '2024-03-03 23:52:32'); INSERT INTO `sys_menu` VALUES (14, 13, 1, '订单列表', 'order', 'oms/order/index', NULL, 'el-icon-Document', 1, 1, NULL, 'null,13', NULL, 1, '2021-08-28 09:12:21', '2024-03-03 23:45:09'); INSERT INTO `sys_menu` VALUES (15, 0, 1, '会员管理', '/ums', 'Layout', NULL, 'user', 4, 1, '/ums/member', NULL, NULL, 1, '2021-08-28 09:12:21', '2021-08-28 09:12:21'); INSERT INTO `sys_menu` VALUES (16, 15, 1, '会员列表', 'member', 'ums/member/index', NULL, 'peoples', 1, 1, NULL, NULL, NULL, 1, '2021-08-28 09:12:21', '2021-08-28 09:12:21'); -INSERT INTO `sys_menu` VALUES (17, 11, 1, '品牌管理', 'brand', 'pms/brand/index', NULL, 'brand', 5, 1, NULL, NULL, NULL, 1, '2021-08-28 09:12:21', '2021-08-28 09:12:21'); -INSERT INTO `sys_menu` VALUES (18, 11, 1, '商品分类', 'category', 'pms/category/index', NULL, 'menu', 3, 1, NULL, NULL, NULL, 1, '2021-08-28 09:12:21', '2021-08-28 09:12:21'); -INSERT INTO `sys_menu` VALUES (19, 11, 1, '商品上架', 'goods-detail', 'pms/goods/detail', NULL, 'publish', 2, 1, NULL, NULL, NULL, NULL, '2021-08-28 09:12:21', '2021-08-28 09:12:21'); +INSERT INTO `sys_menu` VALUES (17, 11, 1, '品牌管理', 'brand', 'product/brand/index', NULL, 'brand', 5, 1, NULL, NULL, NULL, 1, '2021-08-28 09:12:21', '2021-08-28 09:12:21'); +INSERT INTO `sys_menu` VALUES (18, 11, 1, '商品分类', 'category', 'product/category/index', NULL, 'menu', 3, 1, NULL, NULL, NULL, 1, '2021-08-28 09:12:21', '2021-08-28 09:12:21'); +INSERT INTO `sys_menu` VALUES (19, 11, 1, '商品上架', 'goods-detail', 'product/goods/detail', NULL, 'publish', 2, 1, NULL, NULL, NULL, NULL, '2021-08-28 09:12:21', '2021-08-28 09:12:21'); INSERT INTO `sys_menu` VALUES (20, 0, 2, '多级菜单', '/multi-level', 'Layout', NULL, 'nested', 7, 1, '/nested/level1/level2', NULL, NULL, NULL, '2022-02-16 23:11:00', '2022-02-16 23:11:00'); INSERT INTO `sys_menu` VALUES (21, 20, 1, '菜单一级', 'level1', 'demo/multi-level/level1', NULL, '', 1, 1, '/nested/level1/level2', NULL, NULL, NULL, '2022-02-16 23:13:38', '2022-02-16 23:13:38'); INSERT INTO `sys_menu` VALUES (22, 21, 1, '菜单二级', 'level2', 'demo/multi-level/children/level2', NULL, '', 1, 1, '/nested/level1/level2/level3', NULL, NULL, NULL, '2022-02-16 23:14:23', '2022-02-16 23:14:23'); diff --git a/docs/sql/mysql8/youlai_system.sql b/docs/sql/mysql8/youlai_system.sql index fa3b36b02..0b1e08c9d 100644 --- a/docs/sql/mysql8/youlai_system.sql +++ b/docs/sql/mysql8/youlai_system.sql @@ -111,15 +111,15 @@ INSERT INTO `sys_menu` VALUES (5, 1, 1, '部门管理', 'dept', 'system/dept/ind INSERT INTO `sys_menu` VALUES (6, 1, 1, '字典管理', 'dict', 'system/dict/index', NULL, 'dict', 5, 1, NULL, NULL, NULL, 1, '2021-08-28 09:12:21', '2021-08-28 09:12:21'); INSERT INTO `sys_menu` VALUES (9, 0, 2, '营销管理', '/sms', 'Layout', NULL, 'number', 5, 1, NULL, NULL, NULL, NULL, '2021-08-28 09:12:21', '2021-08-28 09:12:21'); INSERT INTO `sys_menu` VALUES (10, 9, 1, '广告列表', 'advert', 'sms/advert/index', NULL, 'advert', 1, 1, NULL, NULL, NULL, 1, '2021-08-28 09:12:21', '2021-08-28 09:12:21'); -INSERT INTO `sys_menu` VALUES (11, 0, 1, '商品管理', '/pms', 'Layout', NULL, 'el-icon-Goods', 2, 1, '/pms/goods', '0', NULL, 1, '2021-08-28 09:12:21', '2024-03-03 23:54:35'); -INSERT INTO `sys_menu` VALUES (12, 11, 1, '商品列表', 'goods', 'pms/goods/index', NULL, 'goods-list', 1, 1, NULL, NULL, NULL, 1, '2021-08-28 09:12:21', '2021-08-28 09:12:21'); +INSERT INTO `sys_menu` VALUES (11, 0, 1, '商品管理', '/product', 'Layout', NULL, 'el-icon-Goods', 2, 1, '/product/goods', '0', NULL, 1, '2021-08-28 09:12:21', '2024-03-03 23:54:35'); +INSERT INTO `sys_menu` VALUES (12, 11, 1, '商品列表', 'goods', 'product/goods/index', NULL, 'goods-list', 1, 1, NULL, NULL, NULL, 1, '2021-08-28 09:12:21', '2021-08-28 09:12:21'); INSERT INTO `sys_menu` VALUES (13, 0, 2, '订单管理', '/oms', 'Layout', NULL, 'el-icon-ShoppingCart', 3, 1, '/oms/order', '0', 1, 1, '2021-08-28 09:12:21', '2024-03-03 23:52:32'); INSERT INTO `sys_menu` VALUES (14, 13, 1, '订单列表', 'order', 'oms/order/index', NULL, 'el-icon-Document', 1, 1, NULL, 'null,13', NULL, 1, '2021-08-28 09:12:21', '2024-03-03 23:45:09'); INSERT INTO `sys_menu` VALUES (15, 0, 1, '会员管理', '/ums', 'Layout', NULL, 'user', 4, 1, '/ums/member', NULL, NULL, 1, '2021-08-28 09:12:21', '2021-08-28 09:12:21'); INSERT INTO `sys_menu` VALUES (16, 15, 1, '会员列表', 'member', 'ums/member/index', NULL, 'peoples', 1, 1, NULL, NULL, NULL, 1, '2021-08-28 09:12:21', '2021-08-28 09:12:21'); -INSERT INTO `sys_menu` VALUES (17, 11, 1, '品牌管理', 'brand', 'pms/brand/index', NULL, 'brand', 5, 1, NULL, NULL, NULL, 1, '2021-08-28 09:12:21', '2021-08-28 09:12:21'); -INSERT INTO `sys_menu` VALUES (18, 11, 1, '商品分类', 'category', 'pms/category/index', NULL, 'menu', 3, 1, NULL, NULL, NULL, 1, '2021-08-28 09:12:21', '2021-08-28 09:12:21'); -INSERT INTO `sys_menu` VALUES (19, 11, 1, '商品上架', 'goods-detail', 'pms/goods/detail', NULL, 'publish', 2, 1, NULL, NULL, NULL, NULL, '2021-08-28 09:12:21', '2021-08-28 09:12:21'); +INSERT INTO `sys_menu` VALUES (17, 11, 1, '品牌管理', 'brand', 'product/brand/index', NULL, 'brand', 5, 1, NULL, NULL, NULL, 1, '2021-08-28 09:12:21', '2021-08-28 09:12:21'); +INSERT INTO `sys_menu` VALUES (18, 11, 1, '商品分类', 'category', 'product/category/index', NULL, 'menu', 3, 1, NULL, NULL, NULL, 1, '2021-08-28 09:12:21', '2021-08-28 09:12:21'); +INSERT INTO `sys_menu` VALUES (19, 11, 1, '商品上架', 'goods-detail', 'product/goods/detail', NULL, 'publish', 2, 1, NULL, NULL, NULL, NULL, '2021-08-28 09:12:21', '2021-08-28 09:12:21'); INSERT INTO `sys_menu` VALUES (20, 0, 2, '多级菜单', '/multi-level', 'Layout', NULL, 'nested', 7, 1, '/nested/level1/level2', NULL, NULL, NULL, '2022-02-16 23:11:00', '2022-02-16 23:11:00'); INSERT INTO `sys_menu` VALUES (21, 20, 1, '菜单一级', 'level1', 'demo/multi-level/level1', NULL, '', 1, 1, '/nested/level1/level2', NULL, NULL, NULL, '2022-02-16 23:13:38', '2022-02-16 23:13:38'); INSERT INTO `sys_menu` VALUES (22, 21, 1, '菜单二级', 'level2', 'demo/multi-level/children/level2', NULL, '', 1, 1, '/nested/level1/level2/level3', NULL, NULL, NULL, '2022-02-16 23:14:23', '2022-02-16 23:14:23'); diff --git a/mall-oms/oms-boot/pom.xml b/mall-oms/oms-boot/pom.xml index 7fe501372..632ea2045 100644 --- a/mall-oms/oms-boot/pom.xml +++ b/mall-oms/oms-boot/pom.xml @@ -60,7 +60,7 @@ com.youlai - pms-api + product-api diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/OmsApplication.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/OmsApplication.java index 473680bde..9e67f291c 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/OmsApplication.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/OmsApplication.java @@ -1,6 +1,6 @@ package com.youlai.mall.oms; -import com.youlai.mall.pms.api.SkuFeignClient; +import com.youlai.mall.product.api.SkuFeignClient; import com.youlai.mall.ums.api.MemberFeignClient; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/converter/OrderConverter.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/converter/OrderConverter.java index 43dc9f908..432731659 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/converter/OrderConverter.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/converter/OrderConverter.java @@ -23,9 +23,9 @@ public interface OrderConverter { @Mappings({ @Mapping(target = "orderSn", source = "orderToken"), @Mapping(target = "totalQuantity", - expression = "java(orderSubmitForm.getOrderItems().stream().map(OrderSubmitForm.OrderItem::getQuantity).reduce(0, Integer::sum))"), + expression = "java(orderSubmitForm.getOrderItems().stream().map(OrderSubmitForm.OrderItem::getSkuQuantity).reduce(0, Integer::sum))"), @Mapping(target = "totalAmount", - expression = "java(orderSubmitForm.getOrderItems().stream().map(item -> item.getPrice() * item.getQuantity()).reduce(0L, Long::sum))"), + expression = "java(orderSubmitForm.getOrderItems().stream().map(item -> item.getSkuPrice() * item.getSkuQuantity()).reduce(0L, Long::sum))"), @Mapping(target = "source", expression = "java(orderSubmitForm.getOrderSource().getValue())"), }) OmsOrder form2Entity(OrderSubmitForm orderSubmitForm); diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/app/impl/OrderServiceImpl.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/app/impl/OrderServiceImpl.java index 409aa3616..87df3699d 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/app/impl/OrderServiceImpl.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/app/impl/OrderServiceImpl.java @@ -40,9 +40,9 @@ import com.youlai.mall.oms.model.vo.OrderConfirmVO; import com.youlai.mall.oms.model.vo.OrderPageVO; import com.youlai.mall.oms.service.app.OrderItemService; import com.youlai.mall.oms.service.app.OrderService; -import com.youlai.mall.pms.api.SkuFeignClient; -import com.youlai.mall.pms.model.dto.LockSkuDTO; -import com.youlai.mall.pms.model.dto.SkuInfoDto; +import com.youlai.mall.product.api.SkuFeignClient; +import com.youlai.mall.product.model.dto.LockSkuDTO; +import com.youlai.mall.product.model.dto.SkuInfoDto; import com.youlai.mall.ums.api.MemberFeignClient; import com.youlai.mall.ums.dto.CartItemDTO; import com.youlai.mall.ums.dto.MemberAddressDTO; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/mapper/SkuSpecValueMapper.java b/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/mapper/SkuSpecValueMapper.java deleted file mode 100644 index 84e31c009..000000000 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/mapper/SkuSpecValueMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.youlai.mall.pms.mapper; - -import com.youlai.mall.pms.model.entity.SkuSpecValue; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.mall.pms.model.bo.SkuSpecValueBO; -import com.youlai.mall.pms.model.query.SkuSpecValuePageQuery; -import org.apache.ibatis.annotations.Mapper; - -/** - * SKU规格值 Mapper 接口 - * - * @author Ray Hao - * @since 2024-04-14 - */ - -@Mapper -public interface SkuSpecValueMapper extends BaseMapper { - - - -} diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/form/PmsCategoryAttributeForm.java b/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/form/PmsCategoryAttributeForm.java deleted file mode 100644 index 4579f316a..000000000 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/form/PmsCategoryAttributeForm.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.youlai.mall.pms.model.form; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; -import java.util.List; - - -@Data -@Schema(description = "属性表单") -public class PmsCategoryAttributeForm { - - @Schema(description="分类ID") - @NotNull - private Long categoryId; - - - @Schema(description="属性类型（1：规格；2：属性）") - @NotNull - private Integer type; - - @Schema(description="属性集合") - @NotEmpty - private List attributes; - - @Data - public static class Attribute { - - @Schema(description="属性ID") - private Long id; - - @Schema(description="属性名称") - @NotBlank - private String name; - } - -} diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/BrandService.java b/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/BrandService.java deleted file mode 100644 index e03360e66..000000000 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/BrandService.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.youlai.mall.pms.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.mall.pms.model.entity.Brand; - -public interface BrandService extends IService { - -} diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/SkuSpecValueService.java b/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/SkuSpecValueService.java deleted file mode 100644 index 19ec222ee..000000000 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/SkuSpecValueService.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.youlai.mall.pms.service; - -import com.youlai.mall.pms.model.entity.SkuSpecValue; -import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.mall.pms.model.form.SkuSpecValueForm; -import com.youlai.mall.pms.model.form.SpuForm; -import com.youlai.mall.pms.model.query.SkuSpecValuePageQuery; -import com.youlai.mall.pms.model.vo.SkuSpecValuePageVO; -import com.baomidou.mybatisplus.core.metadata.IPage; - -import java.util.List; - -/** - * SKU规格值 服务类 - * - * @author Ray Hao - * @since 2024-04-14 - */ -public interface SkuSpecValueService extends IService { - - void saveSkuSpecValues(Long id, List specList); -} diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/impl/BrandServiceImpl.java b/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/impl/BrandServiceImpl.java deleted file mode 100644 index a54f88d80..000000000 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/impl/BrandServiceImpl.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.youlai.mall.pms.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.youlai.mall.pms.mapper.BrandMapper; -import com.youlai.mall.pms.model.entity.Brand; -import com.youlai.mall.pms.service.BrandService; -import org.springframework.stereotype.Service; - -@Service -public class BrandServiceImpl extends ServiceImpl implements BrandService { -} diff --git a/mall-pms/pom.xml b/mall-product/pom.xml similarity index 81% rename from mall-pms/pom.xml rename to mall-product/pom.xml index 73e10f488..86810f3c5 100644 --- a/mall-pms/pom.xml +++ b/mall-product/pom.xml @@ -9,11 +9,11 @@ 4.0.0 - mall-pms + mall-product pom - pms-api - pms-boot + product-api + product-boot diff --git a/mall-pms/pms-api/pom.xml b/mall-product/product-api/pom.xml similarity index 92% rename from mall-pms/pms-api/pom.xml rename to mall-product/product-api/pom.xml index 9bee6f040..8a3dd0934 100644 --- a/mall-pms/pms-api/pom.xml +++ b/mall-product/product-api/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - mall-pms + mall-product com.youlai 3.2.1 4.0.0 - pms-api + product-api diff --git a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/api/SkuFeignClient.java b/mall-product/product-api/src/main/java/com/youlai/mall/product/api/SkuFeignClient.java similarity index 83% rename from mall-pms/pms-api/src/main/java/com/youlai/mall/pms/api/SkuFeignClient.java rename to mall-product/product-api/src/main/java/com/youlai/mall/product/api/SkuFeignClient.java index ba0a1bbdb..f170d476b 100644 --- a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/api/SkuFeignClient.java +++ b/mall-product/product-api/src/main/java/com/youlai/mall/product/api/SkuFeignClient.java @@ -1,15 +1,15 @@ -package com.youlai.mall.pms.api; +package com.youlai.mall.product.api; import com.youlai.common.web.config.FeignDecoderConfig; -import com.youlai.mall.pms.model.dto.LockSkuDTO; -import com.youlai.mall.pms.model.dto.SkuInfoDto; +import com.youlai.mall.product.model.dto.LockSkuDTO; +import com.youlai.mall.product.model.dto.SkuInfoDto; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; import java.util.List; -@FeignClient(value = "mall-pms", contextId = "sku", configuration = {FeignDecoderConfig.class}) +@FeignClient(value = "mall-product", contextId = "sku", configuration = {FeignDecoderConfig.class}) public interface SkuFeignClient { /** diff --git a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/model/dto/CheckPriceDTO.java b/mall-product/product-api/src/main/java/com/youlai/mall/product/model/dto/CheckPriceDTO.java similarity index 94% rename from mall-pms/pms-api/src/main/java/com/youlai/mall/pms/model/dto/CheckPriceDTO.java rename to mall-product/product-api/src/main/java/com/youlai/mall/product/model/dto/CheckPriceDTO.java index c88587f0b..3b24bdd49 100644 --- a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/model/dto/CheckPriceDTO.java +++ b/mall-product/product-api/src/main/java/com/youlai/mall/product/model/dto/CheckPriceDTO.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.model.dto; +package com.youlai.mall.product.model.dto; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/model/dto/LockSkuDTO.java b/mall-product/product-api/src/main/java/com/youlai/mall/product/model/dto/LockSkuDTO.java similarity index 89% rename from mall-pms/pms-api/src/main/java/com/youlai/mall/pms/model/dto/LockSkuDTO.java rename to mall-product/product-api/src/main/java/com/youlai/mall/product/model/dto/LockSkuDTO.java index 2f510f962..f9448b273 100644 --- a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/model/dto/LockSkuDTO.java +++ b/mall-product/product-api/src/main/java/com/youlai/mall/product/model/dto/LockSkuDTO.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.model.dto; +package com.youlai.mall.product.model.dto; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/model/dto/SkuInfoDto.java b/mall-product/product-api/src/main/java/com/youlai/mall/product/model/dto/SkuInfoDto.java similarity index 93% rename from mall-pms/pms-api/src/main/java/com/youlai/mall/pms/model/dto/SkuInfoDto.java rename to mall-product/product-api/src/main/java/com/youlai/mall/product/model/dto/SkuInfoDto.java index a4646f32a..31a51038c 100644 --- a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/model/dto/SkuInfoDto.java +++ b/mall-product/product-api/src/main/java/com/youlai/mall/product/model/dto/SkuInfoDto.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.model.dto; +package com.youlai.mall.product.model.dto; import lombok.Data; diff --git a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/model/vo/OrderItemVO.java b/mall-product/product-api/src/main/java/com/youlai/mall/product/model/vo/OrderItemVO.java similarity index 95% rename from mall-pms/pms-api/src/main/java/com/youlai/mall/pms/model/vo/OrderItemVO.java rename to mall-product/product-api/src/main/java/com/youlai/mall/product/model/vo/OrderItemVO.java index 4e5ded8a2..73f7ba863 100644 --- a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/model/vo/OrderItemVO.java +++ b/mall-product/product-api/src/main/java/com/youlai/mall/product/model/vo/OrderItemVO.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.model.vo; +package com.youlai.mall.product.model.vo; import com.youlai.common.base.BaseVO; import lombok.Builder; diff --git a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/model/vo/ProductHistoryVO.java b/mall-product/product-api/src/main/java/com/youlai/mall/product/model/vo/ProductHistoryVO.java similarity index 87% rename from mall-pms/pms-api/src/main/java/com/youlai/mall/pms/model/vo/ProductHistoryVO.java rename to mall-product/product-api/src/main/java/com/youlai/mall/product/model/vo/ProductHistoryVO.java index fe8ec128c..bbeb04018 100644 --- a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/model/vo/ProductHistoryVO.java +++ b/mall-product/product-api/src/main/java/com/youlai/mall/product/model/vo/ProductHistoryVO.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.model.vo; +package com.youlai.mall.product.model.vo; import lombok.Data; diff --git a/mall-pms/pms-boot/Dockerfile b/mall-product/product-boot/Dockerfile similarity index 96% rename from mall-pms/pms-boot/Dockerfile rename to mall-product/product-boot/Dockerfile index 86ba277c6..6de64775a 100644 --- a/mall-pms/pms-boot/Dockerfile +++ b/mall-product/product-boot/Dockerfile @@ -14,7 +14,7 @@ RUN echo "https://mirrors.ustc.edu.cn/alpine/v3.7/main/" > /etc/apk/repositories VOLUME /tmp # 复制主机文件至镜像内，复制的目录需放置在 Dockerfile 文件同级目录下 -ADD target/pms-boot.jar app.jar +ADD target/product-boot.jar app.jar # 容器启动执行命令 CMD java \ diff --git a/mall-pms/pms-boot/pom.xml b/mall-product/product-boot/pom.xml similarity index 95% rename from mall-pms/pms-boot/pom.xml rename to mall-product/product-boot/pom.xml index b6bba0da2..588497e2c 100644 --- a/mall-pms/pms-boot/pom.xml +++ b/mall-product/product-boot/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - mall-pms + mall-product com.youlai 3.2.1 4.0.0 - pms-boot + product-boot 8802 @@ -53,7 +53,7 @@ com.youlai - pms-api + product-api diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/PmsApplication.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/ProductApplication.java similarity index 78% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/PmsApplication.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/ProductApplication.java index 8bb1eb609..9da27079c 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/PmsApplication.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/ProductApplication.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms; +package com.youlai.mall.product; import com.youlai.mall.ums.api.MemberFeignClient; import org.springframework.boot.SpringApplication; @@ -9,8 +9,8 @@ import org.springframework.cloud.openfeign.EnableFeignClients; @SpringBootApplication @EnableDiscoveryClient @EnableFeignClients(basePackageClasses = {MemberFeignClient.class}) -public class PmsApplication { +public class ProductApplication { public static void main(String[] args) { - SpringApplication.run(PmsApplication.class, args); + SpringApplication.run(ProductApplication.class, args); } } diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/constant/ProductConstants.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/constant/ProductConstants.java similarity index 87% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/constant/ProductConstants.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/constant/ProductConstants.java index 205b8de8c..1367620b2 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/constant/ProductConstants.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/constant/ProductConstants.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.constant; +package com.youlai.mall.product.constant; /** * 商品常量 diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/controller/admin/AttributeController.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/controller/admin/AttributeController.java similarity index 82% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/controller/admin/AttributeController.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/controller/admin/AttributeController.java index 3414056ae..316f2dced 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/controller/admin/AttributeController.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/controller/admin/AttributeController.java @@ -1,16 +1,12 @@ -package com.youlai.mall.pms.controller.admin; +package com.youlai.mall.product.controller.admin; -import com.youlai.mall.pms.model.form.AttributeGroupForm; -import com.youlai.mall.pms.model.query.AttributeGroupPageQuery; -import com.youlai.mall.pms.model.vo.AttributeGroupPageVO; -import com.youlai.mall.pms.service.AttributeGroupService; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.youlai.mall.pms.model.form.AttributeForm; -import com.youlai.mall.pms.model.query.AttributePageQuery; -import com.youlai.mall.pms.model.vo.AttributePageVO; -import com.youlai.mall.pms.service.AttributeService; +import com.youlai.mall.product.model.form.AttributeForm; +import com.youlai.mall.product.model.query.AttributePageQuery; +import com.youlai.mall.product.model.vo.AttributePageVO; +import com.youlai.mall.product.service.AttributeService; import com.baomidou.mybatisplus.core.metadata.IPage; import com.youlai.common.result.PageResult; import com.youlai.common.result.Result; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/controller/admin/AttributeGroupController.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/controller/admin/AttributeGroupController.java similarity index 89% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/controller/admin/AttributeGroupController.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/controller/admin/AttributeGroupController.java index d61330779..211e10ef3 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/controller/admin/AttributeGroupController.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/controller/admin/AttributeGroupController.java @@ -1,12 +1,12 @@ -package com.youlai.mall.pms.controller.admin; +package com.youlai.mall.product.controller.admin; import com.baomidou.mybatisplus.core.metadata.IPage; import com.youlai.common.result.PageResult; import com.youlai.common.result.Result; -import com.youlai.mall.pms.model.form.AttributeGroupForm; -import com.youlai.mall.pms.model.query.AttributeGroupPageQuery; -import com.youlai.mall.pms.model.vo.AttributeGroupPageVO; -import com.youlai.mall.pms.service.AttributeGroupService; +import com.youlai.mall.product.model.form.AttributeGroupForm; +import com.youlai.mall.product.model.query.AttributeGroupPageQuery; +import com.youlai.mall.product.model.vo.AttributeGroupPageVO; +import com.youlai.mall.product.service.AttributeGroupService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/controller/admin/BrandController.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/controller/admin/BrandController.java similarity index 82% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/controller/admin/BrandController.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/controller/admin/BrandController.java index 0b6d20fb3..20e072384 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/controller/admin/BrandController.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/controller/admin/BrandController.java @@ -1,13 +1,13 @@ -package com.youlai.mall.pms.controller.admin; +package com.youlai.mall.product.controller.admin; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.youlai.common.result.PageResult; import com.youlai.common.result.Result; -import com.youlai.mall.pms.model.entity.Brand; -import com.youlai.mall.pms.model.query.BrandPageQuery; -import com.youlai.mall.pms.service.BrandService; +import com.youlai.mall.product.model.entity.Brand; +import com.youlai.mall.product.model.query.BrandPageQuery; +import com.youlai.mall.product.service.BrandService; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -18,9 +18,9 @@ import java.util.Arrays; import java.util.List; /** - * 品牌管理控制器 + * 品牌前端控制器 * - * @author haoxr + * @author Ray Hao * @since 2022/7/2 */ @Tag(name = "Admin-品牌接口") @@ -55,9 +55,9 @@ public class BrandController { return Result.success(list); } - @Operation(summary = "品牌详情") + @Operation(summary = "品牌表单数据") @GetMapping("/{id}") - public Result listBrands(@PathVariable Integer id) { + public Result getBrandDetail(@PathVariable Long id) { Brand brand = brandService.getById(id); return Result.success(brand); } @@ -80,7 +80,9 @@ public class BrandController { @Operation(summary = "删除品牌") @DeleteMapping("/{ids}") - public Result deleteBrands(@Parameter(name = "品牌ID，多个以英文逗号(,)分割") @PathVariable("ids") String ids) { + public Result deleteBrands( + @Parameter(name = "品牌ID，多个以英文逗号(,)分割") @PathVariable("ids") String ids + ) { boolean status = brandService.removeByIds(Arrays.asList(ids.split(","))); return Result.judge(status); } diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/controller/admin/CategoryController.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/controller/admin/CategoryController.java similarity index 88% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/controller/admin/CategoryController.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/controller/admin/CategoryController.java index 6d6c88a95..96a2604bd 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/controller/admin/CategoryController.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/controller/admin/CategoryController.java @@ -1,11 +1,11 @@ -package com.youlai.mall.pms.controller.admin; +package com.youlai.mall.product.controller.admin; import com.youlai.common.result.Result; import com.youlai.common.web.model.Option; -import com.youlai.mall.pms.model.entity.Category; -import com.youlai.mall.pms.model.form.CategoryForm; -import com.youlai.mall.pms.model.vo.CategoryVO; -import com.youlai.mall.pms.service.CategoryService; +import com.youlai.mall.product.model.entity.Category; +import com.youlai.mall.product.model.form.CategoryForm; +import com.youlai.mall.product.model.vo.CategoryVO; +import com.youlai.mall.product.service.CategoryService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/controller/admin/SkuController.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/controller/admin/SkuController.java similarity index 88% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/controller/admin/SkuController.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/controller/admin/SkuController.java index 1eb4b1078..f3c65e95e 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/controller/admin/SkuController.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/controller/admin/SkuController.java @@ -1,8 +1,8 @@ -package com.youlai.mall.pms.controller.admin; +package com.youlai.mall.product.controller.admin; import com.youlai.common.result.Result; -import com.youlai.mall.pms.model.entity.Sku; -import com.youlai.mall.pms.service.SkuService; +import com.youlai.mall.product.model.entity.Sku; +import com.youlai.mall.product.service.SkuService; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/controller/admin/SpuController.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/controller/admin/SpuController.java similarity index 86% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/controller/admin/SpuController.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/controller/admin/SpuController.java index 3a8dd6dcd..bf704d6a8 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/controller/admin/SpuController.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/controller/admin/SpuController.java @@ -1,12 +1,12 @@ -package com.youlai.mall.pms.controller.admin; +package com.youlai.mall.product.controller.admin; import com.baomidou.mybatisplus.core.metadata.IPage; import com.youlai.common.result.PageResult; import com.youlai.common.result.Result; -import com.youlai.mall.pms.model.form.SpuForm; -import com.youlai.mall.pms.model.query.SpuPageQuery; -import com.youlai.mall.pms.model.vo.PmsSpuPageVO; -import com.youlai.mall.pms.service.SpuService; +import com.youlai.mall.product.model.form.SpuForm; +import com.youlai.mall.product.model.query.SpuPageQuery; +import com.youlai.mall.product.model.vo.PmsSpuPageVO; +import com.youlai.mall.product.service.SpuService; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/controller/app/AppCategoryController.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/controller/app/AppCategoryController.java similarity index 86% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/controller/app/AppCategoryController.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/controller/app/AppCategoryController.java index 6108f0462..0a3289209 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/controller/app/AppCategoryController.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/controller/app/AppCategoryController.java @@ -1,8 +1,8 @@ -package com.youlai.mall.pms.controller.app; +package com.youlai.mall.product.controller.app; import com.youlai.common.result.Result; -import com.youlai.mall.pms.model.vo.CategoryVO; -import com.youlai.mall.pms.service.CategoryService; +import com.youlai.mall.product.model.vo.CategoryVO; +import com.youlai.mall.product.service.CategoryService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/controller/app/AppSkuController.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/controller/app/AppSkuController.java similarity index 90% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/controller/app/AppSkuController.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/controller/app/AppSkuController.java index e5dc401c4..166581631 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/controller/app/AppSkuController.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/controller/app/AppSkuController.java @@ -1,9 +1,9 @@ -package com.youlai.mall.pms.controller.app; +package com.youlai.mall.product.controller.app; import com.youlai.common.result.Result; -import com.youlai.mall.pms.model.dto.LockSkuDTO; -import com.youlai.mall.pms.model.dto.SkuInfoDto; -import com.youlai.mall.pms.service.SkuService; +import com.youlai.mall.product.model.dto.LockSkuDTO; +import com.youlai.mall.product.model.dto.SkuInfoDto; +import com.youlai.mall.product.service.SkuService; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/controller/app/AppSpuController.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/controller/app/AppSpuController.java similarity index 83% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/controller/app/AppSpuController.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/controller/app/AppSpuController.java index 5d379ef7d..cbf98070d 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/controller/app/AppSpuController.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/controller/app/AppSpuController.java @@ -1,13 +1,13 @@ -package com.youlai.mall.pms.controller.app; +package com.youlai.mall.product.controller.app; import com.baomidou.mybatisplus.core.metadata.IPage; import com.youlai.common.result.PageResult; import com.youlai.common.result.Result; -import com.youlai.mall.pms.model.query.SpuPageQuery; -import com.youlai.mall.pms.model.vo.SeckillingSpuVO; -import com.youlai.mall.pms.model.vo.SpuDetailVO; -import com.youlai.mall.pms.model.vo.SpuPageVO; -import com.youlai.mall.pms.service.SpuService; +import com.youlai.mall.product.model.query.SpuPageQuery; +import com.youlai.mall.product.model.vo.SeckillingSpuVO; +import com.youlai.mall.product.model.vo.SpuDetailVO; +import com.youlai.mall.product.model.vo.SpuPageVO; +import com.youlai.mall.product.service.SpuService; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/converter/AttributeConverter.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/converter/AttributeConverter.java similarity index 61% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/converter/AttributeConverter.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/converter/AttributeConverter.java index 325eeccd1..62b2034f5 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/converter/AttributeConverter.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/converter/AttributeConverter.java @@ -1,19 +1,18 @@ -package com.youlai.mall.pms.converter; +package com.youlai.mall.product.converter; import org.mapstruct.*; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.mall.pms.model.dto.AttributeDTO; -import com.youlai.mall.pms.model.entity.Attribute; -import com.youlai.mall.pms.model.vo.AttributePageVO; -import com.youlai.mall.pms.model.form.AttributeForm; -import com.youlai.mall.pms.model.bo.AttributeBO; +import com.youlai.mall.product.model.entity.Attribute; +import com.youlai.mall.product.model.vo.AttributePageVO; +import com.youlai.mall.product.model.form.AttributeForm; +import com.youlai.mall.product.model.bo.AttributeBO; @Mapper(componentModel = "spring") public interface AttributeConverter{ @Mappings({ - @Mapping(target = "inputTypeLabel", expression = "java(com.youlai.common.base.IBaseEnum.getLabelByValue(bo.getInputType(), com.youlai.mall.pms.enums.AttributeInputTypeEnum.class))") + @Mapping(target = "inputTypeLabel", expression = "java(com.youlai.common.base.IBaseEnum.getLabelByValue(bo.getInputType(), com.youlai.mall.product.enums.AttributeInputTypeEnum.class))") }) AttributePageVO bo2PageVo(AttributeBO bo); diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/converter/AttributeGroupConverter.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/converter/AttributeGroupConverter.java similarity index 62% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/converter/AttributeGroupConverter.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/converter/AttributeGroupConverter.java index 83da0d8b9..e7b91e361 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/converter/AttributeGroupConverter.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/converter/AttributeGroupConverter.java @@ -1,14 +1,13 @@ -package com.youlai.mall.pms.converter; +package com.youlai.mall.product.converter; import org.mapstruct.InheritInverseConfiguration; import org.mapstruct.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.mall.pms.model.dto.AttributeGroupDTO; -import com.youlai.mall.pms.model.entity.AttributeGroup; -import com.youlai.mall.pms.model.vo.AttributeGroupPageVO; -import com.youlai.mall.pms.model.form.AttributeGroupForm; -import com.youlai.mall.pms.model.bo.AttributeGroupBO; +import com.youlai.mall.product.model.entity.AttributeGroup; +import com.youlai.mall.product.model.vo.AttributeGroupPageVO; +import com.youlai.mall.product.model.form.AttributeGroupForm; +import com.youlai.mall.product.model.bo.AttributeGroupBO; @Mapper(componentModel = "spring") public interface AttributeGroupConverter{ diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/converter/CategoryConverter.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/converter/CategoryConverter.java similarity index 66% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/converter/CategoryConverter.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/converter/CategoryConverter.java index 7b7206015..36bc233ae 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/converter/CategoryConverter.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/converter/CategoryConverter.java @@ -1,7 +1,7 @@ -package com.youlai.mall.pms.converter; +package com.youlai.mall.product.converter; -import com.youlai.mall.pms.model.entity.Category; -import com.youlai.mall.pms.model.form.CategoryForm; +import com.youlai.mall.product.model.entity.Category; +import com.youlai.mall.product.model.form.CategoryForm; import org.mapstruct.InheritInverseConfiguration; import org.mapstruct.Mapper; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/converter/SkuConverter.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/converter/SkuConverter.java similarity index 58% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/converter/SkuConverter.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/converter/SkuConverter.java index 586fdecc9..c229a0d7c 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/converter/SkuConverter.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/converter/SkuConverter.java @@ -1,9 +1,9 @@ -package com.youlai.mall.pms.converter; +package com.youlai.mall.product.converter; -import com.youlai.mall.pms.model.bo.SkuBO; -import com.youlai.mall.pms.model.dto.SkuInfoDto; -import com.youlai.mall.pms.model.entity.Sku; -import com.youlai.mall.pms.model.form.SpuForm; +import com.youlai.mall.product.model.bo.SkuBO; +import com.youlai.mall.product.model.dto.SkuInfoDto; +import com.youlai.mall.product.model.entity.Sku; +import com.youlai.mall.product.model.form.SpuForm; import org.mapstruct.Mapper; import java.util.List; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/converter/SkuSpecValueConverter.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/converter/SkuSpecValueConverter.java similarity index 59% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/converter/SkuSpecValueConverter.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/converter/SkuSpecValueConverter.java index a2b580aba..d22071414 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/converter/SkuSpecValueConverter.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/converter/SkuSpecValueConverter.java @@ -1,17 +1,14 @@ -package com.youlai.mall.pms.converter; +package com.youlai.mall.product.converter; -import com.youlai.mall.pms.model.form.SpuForm; +import com.youlai.mall.product.model.form.SpuForm; import org.mapstruct.InheritInverseConfiguration; import org.mapstruct.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.mall.pms.model.dto.SkuSpecValueDTO; -import com.youlai.mall.pms.model.entity.SkuSpecValue; -import com.youlai.mall.pms.model.vo.SkuSpecValuePageVO; -import com.youlai.mall.pms.model.form.SkuSpecValueForm; -import com.youlai.mall.pms.model.bo.SkuSpecValueBO; - -import java.util.List; +import com.youlai.mall.product.model.entity.SkuSpecValue; +import com.youlai.mall.product.model.vo.SkuSpecValuePageVO; +import com.youlai.mall.product.model.form.SkuSpecValueForm; +import com.youlai.mall.product.model.bo.SkuSpecValueBO; @Mapper(componentModel = "spring") public interface SkuSpecValueConverter{ diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/converter/SpecConverter.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/converter/SpecConverter.java similarity index 52% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/converter/SpecConverter.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/converter/SpecConverter.java index b20690aef..ab9d0f828 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/converter/SpecConverter.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/converter/SpecConverter.java @@ -1,12 +1,10 @@ -package com.youlai.mall.pms.converter; +package com.youlai.mall.product.converter; -import com.youlai.mall.pms.model.form.SpuForm; -import org.mapstruct.InheritInverseConfiguration; import org.mapstruct.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.mall.pms.model.vo.SpecPageVO; -import com.youlai.mall.pms.model.bo.SpuSpecBO; +import com.youlai.mall.product.model.vo.SpecPageVO; +import com.youlai.mall.product.model.bo.SpuSpecBO; @Mapper(componentModel = "spring") public interface SpecConverter{ diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/converter/SpecValueConverter.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/converter/SpecValueConverter.java similarity index 53% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/converter/SpecValueConverter.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/converter/SpecValueConverter.java index 259e71e70..85ababd65 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/converter/SpecValueConverter.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/converter/SpecValueConverter.java @@ -1,12 +1,10 @@ -package com.youlai.mall.pms.converter; +package com.youlai.mall.product.converter; -import org.mapstruct.InheritInverseConfiguration; import org.mapstruct.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.mall.pms.model.vo.SpecValuePageVO; -import com.youlai.mall.pms.model.form.SpecValueForm; -import com.youlai.mall.pms.model.bo.SpuSpecValueBO; +import com.youlai.mall.product.model.vo.SpecValuePageVO; +import com.youlai.mall.product.model.bo.SpuSpecValueBO; @Mapper(componentModel = "spring") public interface SpecValueConverter{ diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/converter/SpuAttributeConverter.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/converter/SpuAttributeConverter.java similarity index 64% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/converter/SpuAttributeConverter.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/converter/SpuAttributeConverter.java index 470ed9eaa..c86860450 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/converter/SpuAttributeConverter.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/converter/SpuAttributeConverter.java @@ -1,10 +1,8 @@ -package com.youlai.mall.pms.converter; +package com.youlai.mall.product.converter; -import com.youlai.mall.pms.model.entity.SpuAttributeValue; -import com.youlai.mall.pms.model.form.SpuForm; +import com.youlai.mall.product.model.entity.SpuAttributeValue; +import com.youlai.mall.product.model.form.SpuForm; import org.mapstruct.Mapper; -import org.mapstruct.Mapping; -import org.mapstruct.Mappings; import java.util.List; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/converter/SpuConverter.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/converter/SpuConverter.java similarity index 71% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/converter/SpuConverter.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/converter/SpuConverter.java index d67ac4379..15eab740c 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/converter/SpuConverter.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/converter/SpuConverter.java @@ -1,8 +1,8 @@ -package com.youlai.mall.pms.converter; +package com.youlai.mall.product.converter; -import com.youlai.mall.pms.model.entity.Spu; -import com.youlai.mall.pms.model.form.SpuForm; -import com.youlai.mall.pms.model.vo.SeckillingSpuVO; +import com.youlai.mall.product.model.entity.Spu; +import com.youlai.mall.product.model.form.SpuForm; +import com.youlai.mall.product.model.vo.SeckillingSpuVO; import org.mapstruct.InheritInverseConfiguration; import org.mapstruct.Mapper; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/converter/SpuImageConverter.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/converter/SpuImageConverter.java similarity index 64% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/converter/SpuImageConverter.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/converter/SpuImageConverter.java index 86c24f7cd..c95fd38a9 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/converter/SpuImageConverter.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/converter/SpuImageConverter.java @@ -1,15 +1,14 @@ -package com.youlai.mall.pms.converter; +package com.youlai.mall.product.converter; -import com.youlai.mall.pms.model.form.SpuForm; +import com.youlai.mall.product.model.form.SpuForm; import org.mapstruct.InheritInverseConfiguration; import org.mapstruct.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.mall.pms.model.dto.SpuImageDTO; -import com.youlai.mall.pms.model.entity.SpuImage; -import com.youlai.mall.pms.model.vo.SpuImagePageVO; -import com.youlai.mall.pms.model.form.SpuImageForm; -import com.youlai.mall.pms.model.bo.SpuImageBO; +import com.youlai.mall.product.model.entity.SpuImage; +import com.youlai.mall.product.model.vo.SpuImagePageVO; +import com.youlai.mall.product.model.form.SpuImageForm; +import com.youlai.mall.product.model.bo.SpuImageBO; import java.util.List; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/enums/AttributeInputTypeEnum.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/enums/AttributeInputTypeEnum.java similarity index 94% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/enums/AttributeInputTypeEnum.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/enums/AttributeInputTypeEnum.java index da9efb4f5..32c01034f 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/enums/AttributeInputTypeEnum.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/enums/AttributeInputTypeEnum.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.enums; +package com.youlai.mall.product.enums; import com.youlai.common.base.IBaseEnum; import lombok.Getter; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/enums/AttributeTypeEnum.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/enums/AttributeTypeEnum.java similarity index 93% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/enums/AttributeTypeEnum.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/enums/AttributeTypeEnum.java index 9b4e04436..a2b650a2a 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/enums/AttributeTypeEnum.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/enums/AttributeTypeEnum.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.enums; +package com.youlai.mall.product.enums; import com.youlai.common.base.IBaseEnum; import lombok.Getter; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/listener/StockListener.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/listener/StockListener.java similarity index 93% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/listener/StockListener.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/listener/StockListener.java index 19136cb4f..d8f802572 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/listener/StockListener.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/listener/StockListener.java @@ -1,8 +1,8 @@ -package com.youlai.mall.pms.listener; +package com.youlai.mall.product.listener; import com.rabbitmq.client.Channel; import com.youlai.common.rabbitmq.constant.RabbitMqConstants; -import com.youlai.mall.pms.service.SkuService; +import com.youlai.mall.product.service.SkuService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.amqp.core.Message; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/mapper/AttributeGroupMapper.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/mapper/AttributeGroupMapper.java similarity index 72% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/mapper/AttributeGroupMapper.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/mapper/AttributeGroupMapper.java index 82ac3c2aa..eaf51b59f 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/mapper/AttributeGroupMapper.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/mapper/AttributeGroupMapper.java @@ -1,10 +1,10 @@ -package com.youlai.mall.pms.mapper; +package com.youlai.mall.product.mapper; -import com.youlai.mall.pms.model.entity.AttributeGroup; +import com.youlai.mall.product.model.entity.AttributeGroup; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.mall.pms.model.bo.AttributeGroupBO; -import com.youlai.mall.pms.model.query.AttributeGroupPageQuery; +import com.youlai.mall.product.model.bo.AttributeGroupBO; +import com.youlai.mall.product.model.query.AttributeGroupPageQuery; import org.apache.ibatis.annotations.Mapper; /** diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/mapper/AttributeMapper.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/mapper/AttributeMapper.java similarity index 72% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/mapper/AttributeMapper.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/mapper/AttributeMapper.java index bda964bf1..2c7d85328 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/mapper/AttributeMapper.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/mapper/AttributeMapper.java @@ -1,10 +1,10 @@ -package com.youlai.mall.pms.mapper; +package com.youlai.mall.product.mapper; -import com.youlai.mall.pms.model.entity.Attribute; +import com.youlai.mall.product.model.entity.Attribute; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.mall.pms.model.bo.AttributeBO; -import com.youlai.mall.pms.model.query.AttributePageQuery; +import com.youlai.mall.product.model.bo.AttributeBO; +import com.youlai.mall.product.model.query.AttributePageQuery; import org.apache.ibatis.annotations.Mapper; /** diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/mapper/BrandMapper.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/mapper/BrandMapper.java similarity index 65% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/mapper/BrandMapper.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/mapper/BrandMapper.java index 474471552..059aa2c66 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/mapper/BrandMapper.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/mapper/BrandMapper.java @@ -1,7 +1,7 @@ -package com.youlai.mall.pms.mapper; +package com.youlai.mall.product.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.youlai.mall.pms.model.entity.Brand; +import com.youlai.mall.product.model.entity.Brand; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/mapper/CategoryBrandMapper.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/mapper/CategoryBrandMapper.java similarity index 65% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/mapper/CategoryBrandMapper.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/mapper/CategoryBrandMapper.java index 0181aae99..739586927 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/mapper/CategoryBrandMapper.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/mapper/CategoryBrandMapper.java @@ -1,7 +1,7 @@ -package com.youlai.mall.pms.mapper; +package com.youlai.mall.product.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.youlai.mall.pms.model.entity.CategoryBrand; +import com.youlai.mall.product.model.entity.CategoryBrand; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/mapper/CategoryMapper.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/mapper/CategoryMapper.java similarity index 81% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/mapper/CategoryMapper.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/mapper/CategoryMapper.java index 11f9d9790..b596dbcf2 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/mapper/CategoryMapper.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/mapper/CategoryMapper.java @@ -1,7 +1,7 @@ -package com.youlai.mall.pms.mapper; +package com.youlai.mall.product.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.youlai.mall.pms.model.entity.Category; +import com.youlai.mall.product.model.entity.Category; import org.apache.ibatis.annotations.Mapper; /** diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/mapper/SkuMapper.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/mapper/SkuMapper.java similarity index 79% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/mapper/SkuMapper.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/mapper/SkuMapper.java index c5d81fbd5..3307350aa 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/mapper/SkuMapper.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/mapper/SkuMapper.java @@ -1,9 +1,9 @@ -package com.youlai.mall.pms.mapper; +package com.youlai.mall.product.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.youlai.mall.pms.model.bo.SkuBO; -import com.youlai.mall.pms.model.dto.SkuInfoDto; -import com.youlai.mall.pms.model.entity.Sku; +import com.youlai.mall.product.model.bo.SkuBO; +import com.youlai.mall.product.model.dto.SkuInfoDto; +import com.youlai.mall.product.model.entity.Sku; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/mall-product/product-boot/src/main/java/com/youlai/mall/product/mapper/SkuSpecValueMapper.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/mapper/SkuSpecValueMapper.java new file mode 100644 index 000000000..0a65ba4d9 --- /dev/null +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/mapper/SkuSpecValueMapper.java @@ -0,0 +1,19 @@ +package com.youlai.mall.product.mapper; + +import com.youlai.mall.product.model.entity.SkuSpecValue; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * SKU规格值 Mapper 接口 + * + * @author Ray Hao + * @since 2024-04-14 + */ + +@Mapper +public interface SkuSpecValueMapper extends BaseMapper { + + + +} diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/mapper/SpuAttributeMapper.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/mapper/SpuAttributeMapper.java similarity index 64% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/mapper/SpuAttributeMapper.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/mapper/SpuAttributeMapper.java index 3500a8808..e1fbf512e 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/mapper/SpuAttributeMapper.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/mapper/SpuAttributeMapper.java @@ -1,7 +1,7 @@ -package com.youlai.mall.pms.mapper; +package com.youlai.mall.product.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.youlai.mall.pms.model.entity.SpuAttributeValue; +import com.youlai.mall.product.model.entity.SpuAttributeValue; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/mapper/SpuImageMapper.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/mapper/SpuImageMapper.java similarity index 72% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/mapper/SpuImageMapper.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/mapper/SpuImageMapper.java index 9d188d932..954759d66 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/mapper/SpuImageMapper.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/mapper/SpuImageMapper.java @@ -1,10 +1,10 @@ -package com.youlai.mall.pms.mapper; +package com.youlai.mall.product.mapper; -import com.youlai.mall.pms.model.entity.SpuImage; +import com.youlai.mall.product.model.entity.SpuImage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.mall.pms.model.bo.SpuImageBO; -import com.youlai.mall.pms.model.query.SpuImagePageQuery; +import com.youlai.mall.product.model.bo.SpuImageBO; +import com.youlai.mall.product.model.query.SpuImagePageQuery; import org.apache.ibatis.annotations.Mapper; /** diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/mapper/SpuMapper.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/mapper/SpuMapper.java similarity index 75% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/mapper/SpuMapper.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/mapper/SpuMapper.java index 9605d2121..6629579ad 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/mapper/SpuMapper.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/mapper/SpuMapper.java @@ -1,11 +1,11 @@ -package com.youlai.mall.pms.mapper; +package com.youlai.mall.product.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.mall.pms.model.entity.Spu; -import com.youlai.mall.pms.model.query.SpuPageQuery; -import com.youlai.mall.pms.model.vo.PmsSpuPageVO; -import com.youlai.mall.pms.model.vo.SpuPageVO; +import com.youlai.mall.product.model.entity.Spu; +import com.youlai.mall.product.model.query.SpuPageQuery; +import com.youlai.mall.product.model.vo.PmsSpuPageVO; +import com.youlai.mall.product.model.vo.SpuPageVO; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/bo/AttributeBO.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/bo/AttributeBO.java similarity index 89% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/bo/AttributeBO.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/bo/AttributeBO.java index 1a7d78f14..49b35faf7 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/bo/AttributeBO.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/bo/AttributeBO.java @@ -1,13 +1,12 @@ -package com.youlai.mall.pms.model.bo; +package com.youlai.mall.product.model.bo; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; + import java.io.Serializable; import java.time.LocalDateTime; import lombok.Getter; import lombok.Setter; -import java.time.LocalDateTime; /** * 属性 diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/bo/AttributeGroupBO.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/bo/AttributeGroupBO.java similarity index 95% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/bo/AttributeGroupBO.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/bo/AttributeGroupBO.java index 499f5e6a7..f0a34d9d8 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/bo/AttributeGroupBO.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/bo/AttributeGroupBO.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.model.bo; +package com.youlai.mall.product.model.bo; import lombok.Getter; import lombok.Setter; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/bo/SkuBO.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/bo/SkuBO.java similarity index 94% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/bo/SkuBO.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/bo/SkuBO.java index 39da8c434..1efee1450 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/bo/SkuBO.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/bo/SkuBO.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.model.bo; +package com.youlai.mall.product.model.bo; import lombok.Data; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/bo/SkuSpecValueBO.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/bo/SkuSpecValueBO.java similarity index 79% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/bo/SkuSpecValueBO.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/bo/SkuSpecValueBO.java index 854110834..fb41e39fc 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/bo/SkuSpecValueBO.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/bo/SkuSpecValueBO.java @@ -1,11 +1,10 @@ -package com.youlai.mall.pms.model.bo; +package com.youlai.mall.product.model.bo; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; + import java.io.Serializable; import lombok.Getter; import lombok.Setter; -import java.time.LocalDateTime; /** * SKU规格值 diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/bo/SpuImageBO.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/bo/SpuImageBO.java similarity index 71% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/bo/SpuImageBO.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/bo/SpuImageBO.java index 87f8fbcbe..b427670e2 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/bo/SpuImageBO.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/bo/SpuImageBO.java @@ -1,10 +1,8 @@ -package com.youlai.mall.pms.model.bo; +package com.youlai.mall.product.model.bo; -import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import lombok.Getter; import lombok.Setter; -import java.time.LocalDateTime; /** * 商品图片 diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/bo/SpuSpecBO.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/bo/SpuSpecBO.java similarity index 93% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/bo/SpuSpecBO.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/bo/SpuSpecBO.java index 0d4b56554..d559327a3 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/bo/SpuSpecBO.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/bo/SpuSpecBO.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.model.bo; +package com.youlai.mall.product.model.bo; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/bo/SpuSpecValueBO.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/bo/SpuSpecValueBO.java similarity index 93% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/bo/SpuSpecValueBO.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/bo/SpuSpecValueBO.java index 93db6cc13..20197ad6b 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/bo/SpuSpecValueBO.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/bo/SpuSpecValueBO.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.model.bo; +package com.youlai.mall.product.model.bo; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/dto/AttributeDTO.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/dto/AttributeDTO.java similarity index 96% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/dto/AttributeDTO.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/dto/AttributeDTO.java index 2115d260f..8cc4c3b81 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/dto/AttributeDTO.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/dto/AttributeDTO.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.model.dto; +package com.youlai.mall.product.model.dto; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/dto/AttributeGroupDTO.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/dto/AttributeGroupDTO.java similarity index 95% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/dto/AttributeGroupDTO.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/dto/AttributeGroupDTO.java index 3162a83d1..5a435436a 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/dto/AttributeGroupDTO.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/dto/AttributeGroupDTO.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.model.dto; +package com.youlai.mall.product.model.dto; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/dto/SkuSpecValueDTO.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/dto/SkuSpecValueDTO.java similarity index 85% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/dto/SkuSpecValueDTO.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/dto/SkuSpecValueDTO.java index d86f532bb..f35a6c248 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/dto/SkuSpecValueDTO.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/dto/SkuSpecValueDTO.java @@ -1,10 +1,10 @@ -package com.youlai.mall.pms.model.dto; +package com.youlai.mall.product.model.dto; import lombok.Getter; import lombok.Setter; import java.io.Serializable; -import java.time.LocalDateTime; + /** * SKU规格值 DTO * diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/dto/SpuImageDTO.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/dto/SpuImageDTO.java similarity index 81% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/dto/SpuImageDTO.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/dto/SpuImageDTO.java index 815e7da47..679938558 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/dto/SpuImageDTO.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/dto/SpuImageDTO.java @@ -1,10 +1,10 @@ -package com.youlai.mall.pms.model.dto; +package com.youlai.mall.product.model.dto; import lombok.Getter; import lombok.Setter; import java.io.Serializable; -import java.time.LocalDateTime; + /** * 商品图片 DTO * diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/dto/SpuSpecDTO.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/dto/SpuSpecDTO.java similarity index 91% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/dto/SpuSpecDTO.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/dto/SpuSpecDTO.java index 38d57e987..288cecc8b 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/dto/SpuSpecDTO.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/dto/SpuSpecDTO.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.model.dto; +package com.youlai.mall.product.model.dto; import lombok.Getter; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/dto/SpuSpecValueDTO.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/dto/SpuSpecValueDTO.java similarity index 91% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/dto/SpuSpecValueDTO.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/dto/SpuSpecValueDTO.java index 86f6c0e7e..b2ffadb76 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/dto/SpuSpecValueDTO.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/dto/SpuSpecValueDTO.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.model.dto; +package com.youlai.mall.product.model.dto; import lombok.Getter; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/entity/Attribute.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/entity/Attribute.java similarity index 87% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/entity/Attribute.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/entity/Attribute.java index d3308621d..3f7ff0c50 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/entity/Attribute.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/entity/Attribute.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.model.entity; +package com.youlai.mall.product.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.youlai.common.base.BaseEntity; @@ -28,7 +28,7 @@ public class Attribute extends BaseEntity { /** * 属性类型：1-规格，2-参数 - * @see com.youlai.mall.pms.enums.AttributeTypeEnum + * @see com.youlai.mall.product.enums.AttributeTypeEnum */ private Integer type; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/entity/AttributeGroup.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/entity/AttributeGroup.java similarity index 92% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/entity/AttributeGroup.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/entity/AttributeGroup.java index 82ef7767a..6fc5681bb 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/entity/AttributeGroup.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/entity/AttributeGroup.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.model.entity; +package com.youlai.mall.product.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.youlai.common.base.BaseEntity; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/entity/Brand.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/entity/Brand.java similarity index 65% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/entity/Brand.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/entity/Brand.java index f109f423c..512e1f84f 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/entity/Brand.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/entity/Brand.java @@ -1,10 +1,9 @@ -package com.youlai.mall.pms.model.entity; +package com.youlai.mall.product.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.youlai.common.base.BaseEntity; import lombok.Data; - /** * 品牌实体 * @@ -25,8 +24,23 @@ public class Brand extends BaseEntity { */ private String logoUrl; + /** + * 品牌的首字母。 + */ + private String firstLetter; + /** * 用于展示在列表中的排序权重，数值越小，排序越靠前。 */ private Integer sort; + + /** + * 是否显示[0-不显示，1-显示] + */ + private Integer visible; + + /** + * 品牌的简介 + */ + private String description; } diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/entity/Category.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/entity/Category.java similarity index 93% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/entity/Category.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/entity/Category.java index 97ae364d4..0e748b9ac 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/entity/Category.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/entity/Category.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.model.entity; +package com.youlai.mall.product.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.youlai.common.base.BaseEntity; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/entity/CategoryBrand.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/entity/CategoryBrand.java similarity index 86% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/entity/CategoryBrand.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/entity/CategoryBrand.java index 50aff5d75..47f701bcf 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/entity/CategoryBrand.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/entity/CategoryBrand.java @@ -1,9 +1,8 @@ -package com.youlai.mall.pms.model.entity; +package com.youlai.mall.product.model.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.youlai.common.base.BaseEntity; import lombok.Data; /** diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/entity/Sku.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/entity/Sku.java similarity index 95% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/entity/Sku.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/entity/Sku.java index 9886380ae..c0d940213 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/entity/Sku.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/entity/Sku.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.model.entity; +package com.youlai.mall.product.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.youlai.common.base.BaseEntity; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/entity/SkuSpecValue.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/entity/SkuSpecValue.java similarity index 94% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/entity/SkuSpecValue.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/entity/SkuSpecValue.java index e1349ecd9..a10e50b50 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/entity/SkuSpecValue.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/entity/SkuSpecValue.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.model.entity; +package com.youlai.mall.product.model.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/entity/Spu.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/entity/Spu.java similarity index 94% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/entity/Spu.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/entity/Spu.java index 22b95ac65..5a37bcc49 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/entity/Spu.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/entity/Spu.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.model.entity; +package com.youlai.mall.product.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.youlai.common.base.BaseEntity; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/entity/SpuAttributeValue.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/entity/SpuAttributeValue.java similarity index 94% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/entity/SpuAttributeValue.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/entity/SpuAttributeValue.java index 8b98eb965..31c9369da 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/entity/SpuAttributeValue.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/entity/SpuAttributeValue.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.model.entity; +package com.youlai.mall.product.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.youlai.common.base.BaseEntity; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/entity/SpuImage.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/entity/SpuImage.java similarity index 91% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/entity/SpuImage.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/entity/SpuImage.java index a61c35364..68b45b467 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/entity/SpuImage.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/entity/SpuImage.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.model.entity; +package com.youlai.mall.product.model.entity; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/form/AttributeForm.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/form/AttributeForm.java similarity index 85% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/form/AttributeForm.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/form/AttributeForm.java index 8184f9e6f..267ffb5fb 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/form/AttributeForm.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/form/AttributeForm.java @@ -1,8 +1,4 @@ -package com.youlai.mall.pms.model.form; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +package com.youlai.mall.product.model.form; import java.io.Serializable; import java.time.LocalDateTime; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/form/AttributeGroupForm.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/form/AttributeGroupForm.java similarity index 94% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/form/AttributeGroupForm.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/form/AttributeGroupForm.java index faa9229b5..46084d4a0 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/form/AttributeGroupForm.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/form/AttributeGroupForm.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.model.form; +package com.youlai.mall.product.model.form; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/form/CategoryForm.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/form/CategoryForm.java similarity index 95% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/form/CategoryForm.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/form/CategoryForm.java index 79fd98490..87e38a5d6 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/form/CategoryForm.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/form/CategoryForm.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.model.form; +package com.youlai.mall.product.model.form; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/form/SkuSpecValueForm.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/form/SkuSpecValueForm.java similarity index 92% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/form/SkuSpecValueForm.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/form/SkuSpecValueForm.java index 25065edda..4d8ddd9eb 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/form/SkuSpecValueForm.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/form/SkuSpecValueForm.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.model.form; +package com.youlai.mall.product.model.form; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/form/SpecForm.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/form/SpecForm.java similarity index 70% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/form/SpecForm.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/form/SpecForm.java index 5289666a3..c9a6b2521 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/form/SpecForm.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/form/SpecForm.java @@ -1,8 +1,5 @@ -package com.youlai.mall.pms.model.form; +package com.youlai.mall.product.model.form; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import lombok.Getter; import lombok.Setter; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/form/SpecValueForm.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/form/SpecValueForm.java similarity index 69% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/form/SpecValueForm.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/form/SpecValueForm.java index 0b0a957fb..b08f06045 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/form/SpecValueForm.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/form/SpecValueForm.java @@ -1,8 +1,4 @@ -package com.youlai.mall.pms.model.form; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +package com.youlai.mall.product.model.form; import java.io.Serializable; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/form/SpuForm.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/form/SpuForm.java similarity index 98% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/form/SpuForm.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/form/SpuForm.java index f523cb9b2..6324970dc 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/form/SpuForm.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/form/SpuForm.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.model.form; +package com.youlai.mall.product.model.form; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/form/SpuImageForm.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/form/SpuImageForm.java similarity index 93% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/form/SpuImageForm.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/form/SpuImageForm.java index b87ade466..889a6b1b2 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/form/SpuImageForm.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/form/SpuImageForm.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.model.form; +package com.youlai.mall.product.model.form; import java.io.Serializable; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/query/AttributeGroupPageQuery.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/query/AttributeGroupPageQuery.java similarity index 75% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/query/AttributeGroupPageQuery.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/query/AttributeGroupPageQuery.java index b6c5a4fe8..f41d02d2b 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/query/AttributeGroupPageQuery.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/query/AttributeGroupPageQuery.java @@ -1,11 +1,8 @@ -package com.youlai.mall.pms.model.query; +package com.youlai.mall.product.model.query; import com.youlai.common.base.BasePageQuery; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; /** * 属性组分页查询对象 diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/query/AttributePageQuery.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/query/AttributePageQuery.java similarity index 90% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/query/AttributePageQuery.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/query/AttributePageQuery.java index 2f90bbae7..0261cf0b7 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/query/AttributePageQuery.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/query/AttributePageQuery.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.model.query; +package com.youlai.mall.product.model.query; import com.youlai.common.base.BasePageQuery; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/query/BrandPageQuery.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/query/BrandPageQuery.java similarity index 89% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/query/BrandPageQuery.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/query/BrandPageQuery.java index 85f17f0de..7962337a5 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/query/BrandPageQuery.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/query/BrandPageQuery.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.model.query; +package com.youlai.mall.product.model.query; import com.youlai.common.base.BasePageQuery; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/query/SkuSpecValuePageQuery.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/query/SkuSpecValuePageQuery.java similarity index 89% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/query/SkuSpecValuePageQuery.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/query/SkuSpecValuePageQuery.java index 5eaca4d67..1342934e1 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/query/SkuSpecValuePageQuery.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/query/SkuSpecValuePageQuery.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.model.query; +package com.youlai.mall.product.model.query; import com.youlai.common.base.BasePageQuery; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/query/SpecPageQuery.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/query/SpecPageQuery.java similarity index 88% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/query/SpecPageQuery.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/query/SpecPageQuery.java index cd7f51bd1..ed18fc7c4 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/query/SpecPageQuery.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/query/SpecPageQuery.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.model.query; +package com.youlai.mall.product.model.query; import com.youlai.common.base.BasePageQuery; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/query/SpecValuePageQuery.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/query/SpecValuePageQuery.java similarity index 89% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/query/SpecValuePageQuery.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/query/SpecValuePageQuery.java index 583dd4ac3..6f021af33 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/query/SpecValuePageQuery.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/query/SpecValuePageQuery.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.model.query; +package com.youlai.mall.product.model.query; import com.youlai.common.base.BasePageQuery; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/query/SpuImagePageQuery.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/query/SpuImagePageQuery.java similarity index 89% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/query/SpuImagePageQuery.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/query/SpuImagePageQuery.java index 92696de41..40954ab92 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/query/SpuImagePageQuery.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/query/SpuImagePageQuery.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.model.query; +package com.youlai.mall.product.model.query; import com.youlai.common.base.BasePageQuery; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/query/SpuPageQuery.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/query/SpuPageQuery.java similarity index 93% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/query/SpuPageQuery.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/query/SpuPageQuery.java index 7f85945f9..ba7e9d2af 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/query/SpuPageQuery.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/query/SpuPageQuery.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.model.query; +package com.youlai.mall.product.model.query; import com.youlai.common.base.BasePageQuery; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/vo/AttributeGroupPageVO.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/vo/AttributeGroupPageVO.java similarity index 95% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/vo/AttributeGroupPageVO.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/vo/AttributeGroupPageVO.java index 2207ffdc9..669886f55 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/vo/AttributeGroupPageVO.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/vo/AttributeGroupPageVO.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.model.vo; +package com.youlai.mall.product.model.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/vo/AttributeGroupVO.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/vo/AttributeGroupVO.java similarity index 95% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/vo/AttributeGroupVO.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/vo/AttributeGroupVO.java index d345b2014..4f6cd3c96 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/vo/AttributeGroupVO.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/vo/AttributeGroupVO.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.model.vo; +package com.youlai.mall.product.model.vo; import java.io.Serializable; import java.time.LocalDateTime; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/vo/AttributePageVO.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/vo/AttributePageVO.java similarity index 95% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/vo/AttributePageVO.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/vo/AttributePageVO.java index 12c774564..9068e2efe 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/vo/AttributePageVO.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/vo/AttributePageVO.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.model.vo; +package com.youlai.mall.product.model.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/vo/AttributeVO.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/vo/AttributeVO.java similarity index 96% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/vo/AttributeVO.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/vo/AttributeVO.java index 799660965..038d109bd 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/vo/AttributeVO.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/vo/AttributeVO.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.model.vo; +package com.youlai.mall.product.model.vo; import java.io.Serializable; import java.time.LocalDateTime; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/vo/CategoryVO.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/vo/CategoryVO.java similarity index 95% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/vo/CategoryVO.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/vo/CategoryVO.java index 6120b2c72..6f4002b32 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/vo/CategoryVO.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/vo/CategoryVO.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.model.vo; +package com.youlai.mall.product.model.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/vo/PmsSpuPageVO.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/vo/PmsSpuPageVO.java similarity index 88% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/vo/PmsSpuPageVO.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/vo/PmsSpuPageVO.java index 489d6efb2..e8ad4658f 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/vo/PmsSpuPageVO.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/vo/PmsSpuPageVO.java @@ -1,6 +1,6 @@ -package com.youlai.mall.pms.model.vo; +package com.youlai.mall.product.model.vo; -import com.youlai.mall.pms.model.entity.Sku; +import com.youlai.mall.product.model.entity.Sku; import lombok.Data; import lombok.experimental.Accessors; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/vo/SeckillingSpuVO.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/vo/SeckillingSpuVO.java similarity index 93% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/vo/SeckillingSpuVO.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/vo/SeckillingSpuVO.java index 17ab0f6b2..a2a957f06 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/vo/SeckillingSpuVO.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/vo/SeckillingSpuVO.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.model.vo; +package com.youlai.mall.product.model.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/vo/SkuSpecValuePageVO.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/vo/SkuSpecValuePageVO.java similarity index 74% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/vo/SkuSpecValuePageVO.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/vo/SkuSpecValuePageVO.java index 6632a26e1..e02f56e65 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/vo/SkuSpecValuePageVO.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/vo/SkuSpecValuePageVO.java @@ -1,7 +1,5 @@ -package com.youlai.mall.pms.model.vo; +package com.youlai.mall.product.model.vo; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import lombok.Getter; import lombok.Setter; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/vo/SkuSpecValueVO.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/vo/SkuSpecValueVO.java similarity index 85% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/vo/SkuSpecValueVO.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/vo/SkuSpecValueVO.java index d55df5689..c44c6e21f 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/vo/SkuSpecValueVO.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/vo/SkuSpecValueVO.java @@ -1,7 +1,7 @@ -package com.youlai.mall.pms.model.vo; +package com.youlai.mall.product.model.vo; import java.io.Serializable; -import java.time.LocalDateTime; + import lombok.Getter; import lombok.Setter; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/vo/SpecPageVO.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/vo/SpecPageVO.java similarity index 70% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/vo/SpecPageVO.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/vo/SpecPageVO.java index 8f623bef7..88117eed0 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/vo/SpecPageVO.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/vo/SpecPageVO.java @@ -1,8 +1,5 @@ -package com.youlai.mall.pms.model.vo; +package com.youlai.mall.product.model.vo; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import lombok.Getter; import lombok.Setter; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/vo/SpecVO.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/vo/SpecVO.java similarity index 92% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/vo/SpecVO.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/vo/SpecVO.java index 9f0b58871..8ddb0ed4f 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/vo/SpecVO.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/vo/SpecVO.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.model.vo; +package com.youlai.mall.product.model.vo; import java.io.Serializable; import java.time.LocalDateTime; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/vo/SpecValuePageVO.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/vo/SpecValuePageVO.java similarity index 93% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/vo/SpecValuePageVO.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/vo/SpecValuePageVO.java index 58eac6fc5..5e2dd0da4 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/vo/SpecValuePageVO.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/vo/SpecValuePageVO.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.model.vo; +package com.youlai.mall.product.model.vo; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/vo/SpecValueVO.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/vo/SpecValueVO.java similarity index 87% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/vo/SpecValueVO.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/vo/SpecValueVO.java index 43f5971c6..cacef047a 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/vo/SpecValueVO.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/vo/SpecValueVO.java @@ -1,7 +1,7 @@ -package com.youlai.mall.pms.model.vo; +package com.youlai.mall.product.model.vo; import java.io.Serializable; -import java.time.LocalDateTime; + import lombok.Getter; import lombok.Setter; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/vo/SpuDetailVO.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/vo/SpuDetailVO.java similarity index 98% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/vo/SpuDetailVO.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/vo/SpuDetailVO.java index 0d70a4472..bf477cb27 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/vo/SpuDetailVO.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/vo/SpuDetailVO.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.model.vo; +package com.youlai.mall.product.model.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/vo/SpuImagePageVO.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/vo/SpuImagePageVO.java similarity index 90% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/vo/SpuImagePageVO.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/vo/SpuImagePageVO.java index 9a0dc8ba8..cbc6a9e9b 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/vo/SpuImagePageVO.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/vo/SpuImagePageVO.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.model.vo; +package com.youlai.mall.product.model.vo; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/vo/SpuImageVO.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/vo/SpuImageVO.java similarity index 82% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/vo/SpuImageVO.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/vo/SpuImageVO.java index 9a3d9e6ad..ea3be828d 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/vo/SpuImageVO.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/vo/SpuImageVO.java @@ -1,7 +1,7 @@ -package com.youlai.mall.pms.model.vo; +package com.youlai.mall.product.model.vo; import java.io.Serializable; -import java.time.LocalDateTime; + import lombok.Getter; import lombok.Setter; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/vo/SpuPageVO.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/vo/SpuPageVO.java similarity index 93% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/vo/SpuPageVO.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/model/vo/SpuPageVO.java index beb006972..1328c0f31 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/model/vo/SpuPageVO.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/model/vo/SpuPageVO.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.model.vo; +package com.youlai.mall.product.model.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/AttributeGroupService.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/service/AttributeGroupService.java similarity index 79% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/AttributeGroupService.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/service/AttributeGroupService.java index 97a447339..e11c2b3a4 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/AttributeGroupService.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/service/AttributeGroupService.java @@ -1,10 +1,10 @@ -package com.youlai.mall.pms.service; +package com.youlai.mall.product.service; -import com.youlai.mall.pms.model.entity.AttributeGroup; +import com.youlai.mall.product.model.entity.AttributeGroup; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.mall.pms.model.form.AttributeGroupForm; -import com.youlai.mall.pms.model.query.AttributeGroupPageQuery; -import com.youlai.mall.pms.model.vo.AttributeGroupPageVO; +import com.youlai.mall.product.model.form.AttributeGroupForm; +import com.youlai.mall.product.model.query.AttributeGroupPageQuery; +import com.youlai.mall.product.model.vo.AttributeGroupPageVO; import com.baomidou.mybatisplus.core.metadata.IPage; /** * 属性组 服务类 diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/AttributeService.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/service/AttributeService.java similarity index 79% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/AttributeService.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/service/AttributeService.java index 6b697bb67..596629296 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/AttributeService.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/service/AttributeService.java @@ -1,10 +1,10 @@ -package com.youlai.mall.pms.service; +package com.youlai.mall.product.service; -import com.youlai.mall.pms.model.entity.Attribute; +import com.youlai.mall.product.model.entity.Attribute; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.mall.pms.model.form.AttributeForm; -import com.youlai.mall.pms.model.query.AttributePageQuery; -import com.youlai.mall.pms.model.vo.AttributePageVO; +import com.youlai.mall.product.model.form.AttributeForm; +import com.youlai.mall.product.model.query.AttributePageQuery; +import com.youlai.mall.product.model.vo.AttributePageVO; import com.baomidou.mybatisplus.core.metadata.IPage; /** * 属性 服务类 diff --git a/mall-product/product-boot/src/main/java/com/youlai/mall/product/service/BrandService.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/service/BrandService.java new file mode 100644 index 000000000..fe15e2711 --- /dev/null +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/service/BrandService.java @@ -0,0 +1,14 @@ +package com.youlai.mall.product.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.youlai.mall.product.model.entity.Brand; + +/** + * 品牌接口 + * + * @author Ray Hao + * @since 2024/7/2 + */ +public interface BrandService extends IService { + +} diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/CategoryBrandService.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/service/CategoryBrandService.java similarity index 67% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/CategoryBrandService.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/service/CategoryBrandService.java index edec7c37b..2c79a7c11 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/CategoryBrandService.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/service/CategoryBrandService.java @@ -1,7 +1,7 @@ -package com.youlai.mall.pms.service; +package com.youlai.mall.product.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.mall.pms.model.entity.CategoryBrand; +import com.youlai.mall.product.model.entity.CategoryBrand; /** diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/CategoryService.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/service/CategoryService.java similarity index 80% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/CategoryService.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/service/CategoryService.java index 51507dc62..1e83278d1 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/CategoryService.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/service/CategoryService.java @@ -1,10 +1,10 @@ -package com.youlai.mall.pms.service; +package com.youlai.mall.product.service; import com.baomidou.mybatisplus.extension.service.IService; import com.youlai.common.web.model.Option; -import com.youlai.mall.pms.model.entity.Category; -import com.youlai.mall.pms.model.form.CategoryForm; -import com.youlai.mall.pms.model.vo.CategoryVO; +import com.youlai.mall.product.model.entity.Category; +import com.youlai.mall.product.model.form.CategoryForm; +import com.youlai.mall.product.model.vo.CategoryVO; import java.util.List; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/SkuService.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/service/SkuService.java similarity index 82% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/SkuService.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/service/SkuService.java index 379b6d262..44d65039a 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/SkuService.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/service/SkuService.java @@ -1,10 +1,10 @@ -package com.youlai.mall.pms.service; +package com.youlai.mall.product.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.mall.pms.model.dto.LockSkuDTO; -import com.youlai.mall.pms.model.dto.SkuInfoDto; -import com.youlai.mall.pms.model.entity.Sku; -import com.youlai.mall.pms.model.form.SpuForm; +import com.youlai.mall.product.model.dto.LockSkuDTO; +import com.youlai.mall.product.model.dto.SkuInfoDto; +import com.youlai.mall.product.model.entity.Sku; +import com.youlai.mall.product.model.form.SpuForm; import java.util.List; /** diff --git a/mall-product/product-boot/src/main/java/com/youlai/mall/product/service/SkuSpecValueService.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/service/SkuSpecValueService.java new file mode 100644 index 000000000..ae0965663 --- /dev/null +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/service/SkuSpecValueService.java @@ -0,0 +1,18 @@ +package com.youlai.mall.product.service; + +import com.youlai.mall.product.model.entity.SkuSpecValue; +import com.baomidou.mybatisplus.extension.service.IService; +import com.youlai.mall.product.model.form.SpuForm; + +import java.util.List; + +/** + * SKU规格值 服务类 + * + * @author Ray Hao + * @since 2024-04-14 + */ +public interface SkuSpecValueService extends IService { + + void saveSkuSpecValues(Long id, List specList); +} diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/SpuAttributeService.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/service/SpuAttributeService.java similarity index 73% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/SpuAttributeService.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/service/SpuAttributeService.java index b773a804e..1ef60f990 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/SpuAttributeService.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/service/SpuAttributeService.java @@ -1,8 +1,8 @@ -package com.youlai.mall.pms.service; +package com.youlai.mall.product.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.mall.pms.model.entity.SpuAttributeValue; -import com.youlai.mall.pms.model.form.SpuForm; +import com.youlai.mall.product.model.entity.SpuAttributeValue; +import com.youlai.mall.product.model.form.SpuForm; import java.util.List; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/SpuImageService.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/service/SpuImageService.java similarity index 74% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/SpuImageService.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/service/SpuImageService.java index e0766c11c..f38d0b0ca 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/SpuImageService.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/service/SpuImageService.java @@ -1,8 +1,8 @@ -package com.youlai.mall.pms.service; +package com.youlai.mall.product.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.mall.pms.model.entity.SpuImage; -import com.youlai.mall.pms.model.form.SpuForm; +import com.youlai.mall.product.model.entity.SpuImage; +import com.youlai.mall.product.model.form.SpuForm; import java.util.List; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/SpuService.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/service/SpuService.java similarity index 84% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/SpuService.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/service/SpuService.java index c365650ac..bf84cfb5c 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/SpuService.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/service/SpuService.java @@ -1,11 +1,11 @@ -package com.youlai.mall.pms.service; +package com.youlai.mall.product.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.mall.pms.model.entity.Spu; -import com.youlai.mall.pms.model.form.SpuForm; -import com.youlai.mall.pms.model.query.SpuPageQuery; -import com.youlai.mall.pms.model.vo.*; +import com.youlai.mall.product.model.entity.Spu; +import com.youlai.mall.product.model.form.SpuForm; +import com.youlai.mall.product.model.query.SpuPageQuery; +import com.youlai.mall.product.model.vo.*; import java.util.List; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/impl/AttributeGroupServiceImpl.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/service/impl/AttributeGroupServiceImpl.java similarity index 84% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/impl/AttributeGroupServiceImpl.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/service/impl/AttributeGroupServiceImpl.java index 742822fa6..dcf3aa2d6 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/impl/AttributeGroupServiceImpl.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/service/impl/AttributeGroupServiceImpl.java @@ -1,27 +1,26 @@ -package com.youlai.mall.pms.service.impl; +package com.youlai.mall.product.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.youlai.mall.pms.model.entity.Attribute; -import com.youlai.mall.pms.model.entity.AttributeGroup; -import com.youlai.mall.pms.mapper.AttributeGroupMapper; -import com.youlai.mall.pms.service.AttributeGroupService; +import com.youlai.mall.product.model.entity.Attribute; +import com.youlai.mall.product.model.entity.AttributeGroup; +import com.youlai.mall.product.mapper.AttributeGroupMapper; +import com.youlai.mall.product.service.AttributeGroupService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.youlai.mall.pms.service.AttributeService; +import com.youlai.mall.product.service.AttributeService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import com.youlai.common.util.DateUtils; -import com.youlai.mall.pms.model.form.AttributeGroupForm; -import com.youlai.mall.pms.model.query.AttributeGroupPageQuery; -import com.youlai.mall.pms.model.bo.AttributeGroupBO; -import com.youlai.mall.pms.model.vo.AttributeGroupPageVO; -import com.youlai.mall.pms.converter.AttributeGroupConverter; +import com.youlai.mall.product.model.form.AttributeGroupForm; +import com.youlai.mall.product.model.query.AttributeGroupPageQuery; +import com.youlai.mall.product.model.bo.AttributeGroupBO; +import com.youlai.mall.product.model.vo.AttributeGroupPageVO; +import com.youlai.mall.product.converter.AttributeGroupConverter; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.Arrays; import java.util.List; -import java.util.stream.Collectors; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.StrUtil; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/impl/AttributeServiceImpl.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/service/impl/AttributeServiceImpl.java similarity index 83% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/impl/AttributeServiceImpl.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/service/impl/AttributeServiceImpl.java index c71941334..d4b15fdf9 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/impl/AttributeServiceImpl.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/service/impl/AttributeServiceImpl.java @@ -1,24 +1,22 @@ -package com.youlai.mall.pms.service.impl; +package com.youlai.mall.product.service.impl; -import com.youlai.mall.pms.model.entity.Attribute; -import com.youlai.mall.pms.mapper.AttributeMapper; -import com.youlai.mall.pms.service.AttributeService; +import com.youlai.mall.product.model.entity.Attribute; +import com.youlai.mall.product.mapper.AttributeMapper; +import com.youlai.mall.product.service.AttributeService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import com.youlai.common.util.DateUtils; -import com.youlai.mall.pms.model.form.AttributeForm; -import com.youlai.mall.pms.model.query.AttributePageQuery; -import com.youlai.mall.pms.model.bo.AttributeBO; -import com.youlai.mall.pms.model.vo.AttributePageVO; -import com.youlai.mall.pms.converter.AttributeConverter; +import com.youlai.mall.product.model.form.AttributeForm; +import com.youlai.mall.product.model.query.AttributePageQuery; +import com.youlai.mall.product.model.bo.AttributeBO; +import com.youlai.mall.product.model.vo.AttributePageVO; +import com.youlai.mall.product.converter.AttributeConverter; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.Arrays; import java.util.List; -import java.util.stream.Collectors; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.StrUtil; diff --git a/mall-product/product-boot/src/main/java/com/youlai/mall/product/service/impl/BrandServiceImpl.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/service/impl/BrandServiceImpl.java new file mode 100644 index 000000000..5421623e2 --- /dev/null +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/service/impl/BrandServiceImpl.java @@ -0,0 +1,18 @@ +package com.youlai.mall.product.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.youlai.mall.product.mapper.BrandMapper; +import com.youlai.mall.product.model.entity.Brand; +import com.youlai.mall.product.service.BrandService; +import org.springframework.stereotype.Service; + +/** + * 品牌接服务现类 + * + * @author Ray Hao + * @since 2024/5/4 + */ +@Service +public class BrandServiceImpl extends ServiceImpl implements BrandService { + +} diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/impl/CategoryBrandServiceImpl.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/service/impl/CategoryBrandServiceImpl.java similarity index 53% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/impl/CategoryBrandServiceImpl.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/service/impl/CategoryBrandServiceImpl.java index 5b0dd20c6..1607690fc 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/impl/CategoryBrandServiceImpl.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/service/impl/CategoryBrandServiceImpl.java @@ -1,9 +1,9 @@ -package com.youlai.mall.pms.service.impl; +package com.youlai.mall.product.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.youlai.mall.pms.mapper.CategoryBrandMapper; -import com.youlai.mall.pms.model.entity.CategoryBrand; -import com.youlai.mall.pms.service.CategoryBrandService; +import com.youlai.mall.product.mapper.CategoryBrandMapper; +import com.youlai.mall.product.model.entity.CategoryBrand; +import com.youlai.mall.product.service.CategoryBrandService; import org.springframework.stereotype.Service; @Service diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/impl/CategoryServiceImpl.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/service/impl/CategoryServiceImpl.java similarity index 90% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/impl/CategoryServiceImpl.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/service/impl/CategoryServiceImpl.java index ab4b73302..1c399af6f 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/impl/CategoryServiceImpl.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/service/impl/CategoryServiceImpl.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.service.impl; +package com.youlai.mall.product.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; @@ -6,12 +6,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.youlai.common.constant.GlobalConstants; import com.youlai.common.web.model.Option; -import com.youlai.mall.pms.converter.CategoryConverter; -import com.youlai.mall.pms.mapper.CategoryMapper; -import com.youlai.mall.pms.model.entity.Category; -import com.youlai.mall.pms.model.form.CategoryForm; -import com.youlai.mall.pms.model.vo.CategoryVO; -import com.youlai.mall.pms.service.CategoryService; +import com.youlai.mall.product.converter.CategoryConverter; +import com.youlai.mall.product.mapper.CategoryMapper; +import com.youlai.mall.product.model.entity.Category; +import com.youlai.mall.product.model.form.CategoryForm; +import com.youlai.mall.product.model.vo.CategoryVO; +import com.youlai.mall.product.service.CategoryService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/impl/SkuServiceImpl.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/service/impl/SkuServiceImpl.java similarity index 92% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/impl/SkuServiceImpl.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/service/impl/SkuServiceImpl.java index f5f3a9834..3c2a0b8eb 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/impl/SkuServiceImpl.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/service/impl/SkuServiceImpl.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.service.impl; +package com.youlai.mall.product.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Assert; @@ -6,17 +6,17 @@ import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.youlai.mall.pms.constant.ProductConstants; -import com.youlai.mall.pms.converter.SkuConverter; -import com.youlai.mall.pms.mapper.SkuMapper; -import com.youlai.mall.pms.model.bo.SkuBO; -import com.youlai.mall.pms.model.dto.LockSkuDTO; -import com.youlai.mall.pms.model.dto.SkuInfoDto; -import com.youlai.mall.pms.model.entity.Sku; -import com.youlai.mall.pms.model.entity.SkuSpecValue; -import com.youlai.mall.pms.model.form.SpuForm; -import com.youlai.mall.pms.service.SkuService; -import com.youlai.mall.pms.service.SkuSpecValueService; +import com.youlai.mall.product.constant.ProductConstants; +import com.youlai.mall.product.converter.SkuConverter; +import com.youlai.mall.product.mapper.SkuMapper; +import com.youlai.mall.product.model.bo.SkuBO; +import com.youlai.mall.product.model.dto.LockSkuDTO; +import com.youlai.mall.product.model.dto.SkuInfoDto; +import com.youlai.mall.product.model.entity.Sku; +import com.youlai.mall.product.model.entity.SkuSpecValue; +import com.youlai.mall.product.model.form.SpuForm; +import com.youlai.mall.product.service.SkuService; +import com.youlai.mall.product.service.SkuSpecValueService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.data.redis.core.RedisTemplate; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/impl/SkuSpecValueServiceImpl.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/service/impl/SkuSpecValueServiceImpl.java similarity index 85% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/impl/SkuSpecValueServiceImpl.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/service/impl/SkuSpecValueServiceImpl.java index 95bb6e1f1..e9e7214ee 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/impl/SkuSpecValueServiceImpl.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/service/impl/SkuSpecValueServiceImpl.java @@ -1,14 +1,13 @@ -package com.youlai.mall.pms.service.impl; +package com.youlai.mall.product.service.impl; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.youlai.mall.pms.converter.SkuSpecValueConverter; -import com.youlai.mall.pms.mapper.SkuSpecValueMapper; -import com.youlai.mall.pms.model.entity.Sku; -import com.youlai.mall.pms.model.entity.SkuSpecValue; -import com.youlai.mall.pms.model.form.SpuForm; -import com.youlai.mall.pms.service.SkuSpecValueService; +import com.youlai.mall.product.converter.SkuSpecValueConverter; +import com.youlai.mall.product.mapper.SkuSpecValueMapper; +import com.youlai.mall.product.model.entity.SkuSpecValue; +import com.youlai.mall.product.model.form.SpuForm; +import com.youlai.mall.product.service.SkuSpecValueService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/impl/SpuAttributeServiceImpl.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/service/impl/SpuAttributeServiceImpl.java similarity index 87% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/impl/SpuAttributeServiceImpl.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/service/impl/SpuAttributeServiceImpl.java index 8c0f8f8fe..e81fa439c 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/impl/SpuAttributeServiceImpl.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/service/impl/SpuAttributeServiceImpl.java @@ -1,13 +1,13 @@ -package com.youlai.mall.pms.service.impl; +package com.youlai.mall.product.service.impl; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.youlai.mall.pms.converter.SpuAttributeConverter; -import com.youlai.mall.pms.mapper.SpuAttributeMapper; -import com.youlai.mall.pms.model.entity.SpuAttributeValue; -import com.youlai.mall.pms.model.form.SpuForm; -import com.youlai.mall.pms.service.SpuAttributeService; +import com.youlai.mall.product.converter.SpuAttributeConverter; +import com.youlai.mall.product.mapper.SpuAttributeMapper; +import com.youlai.mall.product.model.entity.SpuAttributeValue; +import com.youlai.mall.product.model.form.SpuForm; +import com.youlai.mall.product.service.SpuAttributeService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/impl/SpuImageServiceImpl.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/service/impl/SpuImageServiceImpl.java similarity index 88% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/impl/SpuImageServiceImpl.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/service/impl/SpuImageServiceImpl.java index 2bebb8cc0..acf976283 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/impl/SpuImageServiceImpl.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/service/impl/SpuImageServiceImpl.java @@ -1,13 +1,13 @@ -package com.youlai.mall.pms.service.impl; +package com.youlai.mall.product.service.impl; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.youlai.mall.pms.converter.SpuImageConverter; -import com.youlai.mall.pms.mapper.SpuImageMapper; -import com.youlai.mall.pms.model.entity.SpuImage; -import com.youlai.mall.pms.model.form.SpuForm; -import com.youlai.mall.pms.service.SpuImageService; +import com.youlai.mall.product.converter.SpuImageConverter; +import com.youlai.mall.product.mapper.SpuImageMapper; +import com.youlai.mall.product.model.entity.SpuImage; +import com.youlai.mall.product.model.form.SpuForm; +import com.youlai.mall.product.service.SpuImageService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/impl/SpuServiceImpl.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/service/impl/SpuServiceImpl.java similarity index 92% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/impl/SpuServiceImpl.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/service/impl/SpuServiceImpl.java index 3d198e3f5..2f3bce63c 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/impl/SpuServiceImpl.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/service/impl/SpuServiceImpl.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.service.impl; +package com.youlai.mall.product.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; @@ -6,16 +6,16 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.youlai.mall.pms.converter.SpuConverter; -import com.youlai.mall.pms.mapper.SpuMapper; -import com.youlai.mall.pms.model.entity.*; -import com.youlai.mall.pms.model.form.SpuForm; -import com.youlai.mall.pms.model.query.SpuPageQuery; -import com.youlai.mall.pms.model.vo.PmsSpuPageVO; -import com.youlai.mall.pms.model.vo.SeckillingSpuVO; -import com.youlai.mall.pms.model.vo.SpuDetailVO; -import com.youlai.mall.pms.model.vo.SpuPageVO; -import com.youlai.mall.pms.service.*; +import com.youlai.mall.product.converter.SpuConverter; +import com.youlai.mall.product.mapper.SpuMapper; +import com.youlai.mall.product.model.entity.*; +import com.youlai.mall.product.model.form.SpuForm; +import com.youlai.mall.product.model.query.SpuPageQuery; +import com.youlai.mall.product.model.vo.PmsSpuPageVO; +import com.youlai.mall.product.model.vo.SeckillingSpuVO; +import com.youlai.mall.product.model.vo.SpuDetailVO; +import com.youlai.mall.product.model.vo.SpuPageVO; +import com.youlai.mall.product.service.*; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/util/BloomFilterUtils.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/util/BloomFilterUtils.java similarity index 98% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/util/BloomFilterUtils.java rename to mall-product/product-boot/src/main/java/com/youlai/mall/product/util/BloomFilterUtils.java index cec3faa4f..7cea75fcc 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/util/BloomFilterUtils.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/util/BloomFilterUtils.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.util; +package com.youlai.mall.product.util; import com.google.common.hash.Funnel; import com.google.common.hash.Hashing; diff --git a/mall-pms/pms-boot/src/main/resources/bootstrap-dev.yml b/mall-product/product-boot/src/main/resources/bootstrap-dev.yml similarity index 92% rename from mall-pms/pms-boot/src/main/resources/bootstrap-dev.yml rename to mall-product/product-boot/src/main/resources/bootstrap-dev.yml index 28ce5244d..bed242caf 100644 --- a/mall-pms/pms-boot/src/main/resources/bootstrap-dev.yml +++ b/mall-product/product-boot/src/main/resources/bootstrap-dev.yml @@ -2,6 +2,8 @@ server: port: 8802 spring: + jackson: + date-format: "yyyy-MM-dd HH:mm" main: allow-circular-references: true mvc: diff --git a/mall-pms/pms-boot/src/main/resources/bootstrap-prod.yml b/mall-product/product-boot/src/main/resources/bootstrap-prod.yml similarity index 100% rename from mall-pms/pms-boot/src/main/resources/bootstrap-prod.yml rename to mall-product/product-boot/src/main/resources/bootstrap-prod.yml diff --git a/mall-pms/pms-boot/src/main/resources/bootstrap.yml b/mall-product/product-boot/src/main/resources/bootstrap.yml similarity index 68% rename from mall-pms/pms-boot/src/main/resources/bootstrap.yml rename to mall-product/product-boot/src/main/resources/bootstrap.yml index 3855dbb71..72e783662 100644 --- a/mall-pms/pms-boot/src/main/resources/bootstrap.yml +++ b/mall-product/product-boot/src/main/resources/bootstrap.yml @@ -1,5 +1,5 @@ spring: application: - name: mall-pms + name: mall-product profiles: active: dev diff --git a/mall-pms/pms-boot/src/main/resources/mapper/AttributeGroupMapper.xml b/mall-product/product-boot/src/main/resources/mapper/AttributeGroupMapper.xml similarity index 90% rename from mall-pms/pms-boot/src/main/resources/mapper/AttributeGroupMapper.xml rename to mall-product/product-boot/src/main/resources/mapper/AttributeGroupMapper.xml index af91509d2..60bfe67ce 100644 --- a/mall-pms/pms-boot/src/main/resources/mapper/AttributeGroupMapper.xml +++ b/mall-product/product-boot/src/main/resources/mapper/AttributeGroupMapper.xml @@ -3,7 +3,7 @@ - + @@ -20,7 +20,7 @@ - SELECT FROM diff --git a/mall-pms/pms-boot/src/main/resources/mapper/AttributeMapper.xml b/mall-product/product-boot/src/main/resources/mapper/AttributeMapper.xml similarity index 92% rename from mall-pms/pms-boot/src/main/resources/mapper/AttributeMapper.xml rename to mall-product/product-boot/src/main/resources/mapper/AttributeMapper.xml index 7ae650f20..7b71fc839 100644 --- a/mall-pms/pms-boot/src/main/resources/mapper/AttributeMapper.xml +++ b/mall-product/product-boot/src/main/resources/mapper/AttributeMapper.xml @@ -3,7 +3,7 @@ - + @@ -20,7 +20,7 @@ - SELECT FROM diff --git a/mall-pms/pms-boot/src/main/resources/mapper/CategoryMapper.xml b/mall-product/product-boot/src/main/resources/mapper/CategoryMapper.xml similarity index 100% rename from mall-pms/pms-boot/src/main/resources/mapper/CategoryMapper.xml rename to mall-product/product-boot/src/main/resources/mapper/CategoryMapper.xml diff --git a/mall-pms/pms-boot/src/main/resources/mapper/PmsSkuMapper.xml b/mall-product/product-boot/src/main/resources/mapper/PmsSkuMapper.xml similarity index 87% rename from mall-pms/pms-boot/src/main/resources/mapper/PmsSkuMapper.xml rename to mall-product/product-boot/src/main/resources/mapper/PmsSkuMapper.xml index 65bded5b4..ea0f2e0b4 100644 --- a/mall-pms/pms-boot/src/main/resources/mapper/PmsSkuMapper.xml +++ b/mall-product/product-boot/src/main/resources/mapper/PmsSkuMapper.xml @@ -5,7 +5,7 @@ - SELECT t1.id , t1.sku_sn, @@ -22,7 +22,7 @@ - SELECT t1.id, t1.sku_sn, diff --git a/mall-pms/pms-boot/src/main/resources/mapper/PmsSpuMapper.xml b/mall-product/product-boot/src/main/resources/mapper/PmsSpuMapper.xml similarity index 95% rename from mall-pms/pms-boot/src/main/resources/mapper/PmsSpuMapper.xml rename to mall-product/product-boot/src/main/resources/mapper/PmsSpuMapper.xml index 73a61bf64..ba903cf94 100644 --- a/mall-pms/pms-boot/src/main/resources/mapper/PmsSpuMapper.xml +++ b/mall-product/product-boot/src/main/resources/mapper/PmsSpuMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -20,7 +20,7 @@ - + @@ -64,7 +64,7 @@ - SELECT id, NAME, diff --git a/mall-pms/pms-boot/src/test/java/com/youlai/mall/pms/controller/AppSkuControllerTest.java b/mall-product/product-boot/src/test/java/com/youlai/mall/product/controller/AppSkuControllerTest.java similarity index 67% rename from mall-pms/pms-boot/src/test/java/com/youlai/mall/pms/controller/AppSkuControllerTest.java rename to mall-product/product-boot/src/test/java/com/youlai/mall/product/controller/AppSkuControllerTest.java index 0edee303f..dcf6064d2 100644 --- a/mall-pms/pms-boot/src/test/java/com/youlai/mall/pms/controller/AppSkuControllerTest.java +++ b/mall-product/product-boot/src/test/java/com/youlai/mall/product/controller/AppSkuControllerTest.java @@ -1,9 +1,7 @@ -package com.youlai.mall.pms.controller; +package com.youlai.mall.product.controller; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; - class AppSkuControllerTest { @Test diff --git a/mall-pms/pms-boot/src/test/java/com/youlai/mall/pms/generator/PmsAutoGeneratorTest.java b/mall-product/product-boot/src/test/java/com/youlai/mall/product/generator/PmsAutoGeneratorTest.java similarity index 96% rename from mall-pms/pms-boot/src/test/java/com/youlai/mall/pms/generator/PmsAutoGeneratorTest.java rename to mall-product/product-boot/src/test/java/com/youlai/mall/product/generator/PmsAutoGeneratorTest.java index 636532221..12679ea99 100644 --- a/mall-pms/pms-boot/src/test/java/com/youlai/mall/pms/generator/PmsAutoGeneratorTest.java +++ b/mall-product/product-boot/src/test/java/com/youlai/mall/product/generator/PmsAutoGeneratorTest.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.generator; +package com.youlai.mall.product.generator; import com.baomidou.mybatisplus.generator.FastAutoGenerator; import com.baomidou.mybatisplus.generator.config.DataSourceConfig; @@ -30,7 +30,7 @@ public class PmsAutoGeneratorTest { FastAutoGenerator.create(DATA_SOURCE_CONFIG) // 全局配置 .globalConfig((scanner, builder) -> { - builder.outputDir(System.getProperty("user.dir") + "/mall-pms/pms-boot/src/main/java") + builder.outputDir(System.getProperty("user.dir") + "/mall-product/product-boot/src/main/java") .author("Ray Hao") // 设置作者 ; }) @@ -38,13 +38,13 @@ public class PmsAutoGeneratorTest { .packageConfig(builder -> { builder .parent("com.youlai.mall") - .moduleName("pms") + .moduleName("product") .entity("model.entity") .mapper("mapper") .service("service") .serviceImpl("service.impl") .controller("controller.admin") - .pathInfo(Collections.singletonMap(OutputFile.xml, System.getProperty("user.dir") + "/mall-pms/pms-boot/src/main/resources/mapper")); + .pathInfo(Collections.singletonMap(OutputFile.xml, System.getProperty("user.dir") + "/mall-product/product-boot/src/main/resources/mapper")); } ) // 注入配置(设置扩展类的模板路径和包路径) diff --git a/mall-pms/pms-boot/src/test/java/com/youlai/mall/pms/service/SkuServiceTest.java b/mall-product/product-boot/src/test/java/com/youlai/mall/product/service/SkuServiceTest.java similarity index 94% rename from mall-pms/pms-boot/src/test/java/com/youlai/mall/pms/service/SkuServiceTest.java rename to mall-product/product-boot/src/test/java/com/youlai/mall/product/service/SkuServiceTest.java index 1a3bfa2df..055b0f0e3 100644 --- a/mall-pms/pms-boot/src/test/java/com/youlai/mall/pms/service/SkuServiceTest.java +++ b/mall-product/product-boot/src/test/java/com/youlai/mall/product/service/SkuServiceTest.java @@ -1,8 +1,8 @@ -package com.youlai.mall.pms.service; +package com.youlai.mall.product.service; import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.TimeInterval; -import com.youlai.mall.pms.model.dto.LockSkuDTO; +import com.youlai.mall.product.model.dto.LockSkuDTO; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/mall-sms/sms-api/pom.xml b/mall-sms/sms-api/pom.xml index 9285215cd..e4264ef9b 100644 --- a/mall-sms/sms-api/pom.xml +++ b/mall-sms/sms-api/pom.xml @@ -41,7 +41,7 @@ com.youlai - pms-api + product-api diff --git a/mall-sms/sms-boot/src/main/java/com/youlai/mall/sms/model/entity/SmsAdvert.java b/mall-sms/sms-boot/src/main/java/com/youlai/mall/sms/model/entity/SmsAdvert.java index b9877d9b2..b58ce0c79 100644 --- a/mall-sms/sms-boot/src/main/java/com/youlai/mall/sms/model/entity/SmsAdvert.java +++ b/mall-sms/sms-boot/src/main/java/com/youlai/mall/sms/model/entity/SmsAdvert.java @@ -11,9 +11,6 @@ import java.util.Date; @Data public class SmsAdvert extends BaseEntity { - @TableId(type= IdType.AUTO) - private Integer id; - private String title; private String imageUrl; diff --git a/mall-ums/ums-boot/pom.xml b/mall-ums/ums-boot/pom.xml index 3f3796bff..29f60e2ca 100644 --- a/mall-ums/ums-boot/pom.xml +++ b/mall-ums/ums-boot/pom.xml @@ -85,7 +85,7 @@ com.youlai - pms-api + product-api diff --git a/mall-ums/ums-boot/src/main/java/com/youlai/mall/ums/UmsApplication.java b/mall-ums/ums-boot/src/main/java/com/youlai/mall/ums/UmsApplication.java index 408567b56..11370566a 100644 --- a/mall-ums/ums-boot/src/main/java/com/youlai/mall/ums/UmsApplication.java +++ b/mall-ums/ums-boot/src/main/java/com/youlai/mall/ums/UmsApplication.java @@ -1,6 +1,6 @@ package com.youlai.mall.ums; -import com.youlai.mall.pms.api.SkuFeignClient; +import com.youlai.mall.product.api.SkuFeignClient; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; diff --git a/mall-ums/ums-boot/src/main/java/com/youlai/mall/ums/controller/admin/MemberController.java b/mall-ums/ums-boot/src/main/java/com/youlai/mall/ums/controller/admin/MemberController.java index 88c0a26e6..82743cc97 100644 --- a/mall-ums/ums-boot/src/main/java/com/youlai/mall/ums/controller/admin/MemberController.java +++ b/mall-ums/ums-boot/src/main/java/com/youlai/mall/ums/controller/admin/MemberController.java @@ -64,7 +64,7 @@ public class MemberController { ) { boolean status = memberService.update(new LambdaUpdateWrapper() .in(UmsMember::getId, Arrays.asList(ids.split(","))) - .set(UmsMember::getDeleted, GlobalConstants.STATUS_YES)); + .set(UmsMember::getIsDeleted, GlobalConstants.STATUS_YES)); return Result.judge(status); } diff --git a/mall-ums/ums-boot/src/main/java/com/youlai/mall/ums/convert/MemberConvert.java b/mall-ums/ums-boot/src/main/java/com/youlai/mall/ums/convert/MemberConvert.java index c436f233d..28d2eac48 100644 --- a/mall-ums/ums-boot/src/main/java/com/youlai/mall/ums/convert/MemberConvert.java +++ b/mall-ums/ums-boot/src/main/java/com/youlai/mall/ums/convert/MemberConvert.java @@ -36,5 +36,5 @@ public interface MemberConvert { @Mapping(target = "genderLabel", expression = "java(com.youlai.common.base.IBaseEnum.getLabelByValue(bo.getGender(), com.youlai.common.enums.GenderEnum.class))") }) MemberPageVO bo2PageVo(MemberBO bo); - IPage bo2PageVo(Page boPage); + Page bo2PageVo(Page boPage); } diff --git a/mall-ums/ums-boot/src/main/java/com/youlai/mall/ums/service/impl/CartServiceImpl.java b/mall-ums/ums-boot/src/main/java/com/youlai/mall/ums/service/impl/CartServiceImpl.java index 01aace35a..a8d95c859 100644 --- a/mall-ums/ums-boot/src/main/java/com/youlai/mall/ums/service/impl/CartServiceImpl.java +++ b/mall-ums/ums-boot/src/main/java/com/youlai/mall/ums/service/impl/CartServiceImpl.java @@ -3,8 +3,8 @@ package com.youlai.mall.ums.service.impl; import cn.hutool.core.collection.CollectionUtil; import com.youlai.common.constant.RedisConstants; import com.youlai.common.security.util.SecurityUtils; -import com.youlai.mall.pms.api.SkuFeignClient; -import com.youlai.mall.pms.model.dto.SkuInfoDto; +import com.youlai.mall.product.api.SkuFeignClient; +import com.youlai.mall.product.model.dto.SkuInfoDto; import com.youlai.mall.ums.convert.CartConverter; import com.youlai.mall.ums.model.dto.CartItemCache; import com.youlai.mall.ums.dto.CartItemDTO; diff --git a/mall-ums/ums-boot/src/main/java/com/youlai/mall/ums/service/impl/UmsAddressServiceImpl.java b/mall-ums/ums-boot/src/main/java/com/youlai/mall/ums/service/impl/UmsAddressServiceImpl.java index 0a58877da..c4f1c16a1 100644 --- a/mall-ums/ums-boot/src/main/java/com/youlai/mall/ums/service/impl/UmsAddressServiceImpl.java +++ b/mall-ums/ums-boot/src/main/java/com/youlai/mall/ums/service/impl/UmsAddressServiceImpl.java @@ -45,12 +45,12 @@ public class UmsAddressServiceImpl extends ServiceImpl() .eq(UmsAddress::getMemberId, memberId) - .eq(UmsAddress::getDefaulted, 1) + .eq(UmsAddress::getIsDefault, 1) .ne(UmsAddress::getId,umsAddress.getId()) - .set(UmsAddress::getDefaulted, 0) + .set(UmsAddress::getIsDefault, 0) ); } } @@ -74,12 +74,12 @@ public class UmsAddressServiceImpl extends ServiceImpl() .eq(UmsAddress::getMemberId, memberId) - .eq(UmsAddress::getDefaulted, 1) + .eq(UmsAddress::getIsDefault, 1) .ne(UmsAddress::getId, umsAddress.getId()) - .set(UmsAddress::getDefaulted, 0) + .set(UmsAddress::getIsDefault, 0) ); } } @@ -96,7 +96,7 @@ public class UmsAddressServiceImpl extends ServiceImpl umsAddressList = this.list(new LambdaQueryWrapper() .eq(UmsAddress::getMemberId, memberId) - .orderByDesc(UmsAddress::getDefaulted) // 默认地址排在首位 + .orderByDesc(UmsAddress::getIsDefault) // 默认地址排在首位 ); List memberAddressList = Optional.ofNullable(umsAddressList).orElse(new ArrayList<>()).stream() .map(umsAddress -> { diff --git a/pom.xml b/pom.xml index 7eb551c00..316ee4ec0 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ mall-sms mall-ums - mall-pms + mall-product mall-oms @@ -239,7 +239,7 @@ com.youlai - pms-api + product-api ${project.version}