From 3af68bcc7e5bc218f2824a8b8d45a3b6864d11b9 Mon Sep 17 00:00:00 2001 From: "Ray.Hao" <1490493387@qq.com> Date: Mon, 17 Jun 2024 08:25:01 +0800 Subject: [PATCH] =?UTF-8?q?wip:=20=E5=95=86=E5=93=81=E9=87=8D=E6=9E=84?= =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- .../controller/admin/AttributeController.java | 21 +++++++++++++------ .../mall/product/converter/SpecConverter.java | 7 +++---- {mall-marketing => mall-sales}/pom.xml | 6 +++--- .../sales-api}/pom.xml | 4 ++-- .../api/CouponRecordFeignClient.java | 2 +- .../sales-boot}/Dockerfile | 2 +- .../sales-boot}/pom.xml | 6 +++--- .../com/youlai/mall/sms/SalesApplication.java | 4 ++-- .../controller/admin/AdvertController.java | 0 .../controller/admin/CouponController.java | 0 .../controller/app/AdvertAppController.java | 0 .../mall/sms/converter/AdvertConverter.java | 0 .../mall/sms/converter/CouponConverter.java | 0 .../sms/enums/CouponApplicationScopeEnum.java | 0 .../sms/enums/CouponFaceValueTypeEnum.java | 0 .../youlai/mall/sms/enums/CouponTypeEnum.java | 0 .../youlai/mall/sms/enums/PlatformEnum.java | 0 .../sms/enums/ValidityPeriodTypeEnum.java | 0 .../youlai/mall/sms/mapper/AdvertMapper.java | 0 .../mall/sms/mapper/CouponHistoryMapper.java | 0 .../youlai/mall/sms/mapper/CouponMapper.java | 0 .../sms/mapper/CouponSpuCategoryMapper.java | 0 .../mall/sms/mapper/CouponSpuMapper.java | 0 .../youlai/mall/sms/model/entity/Advert.java | 0 .../youlai/mall/sms/model/entity/Coupon.java | 0 .../mall/sms/model/entity/CouponHistory.java | 0 .../mall/sms/model/entity/CouponSpu.java | 0 .../sms/model/entity/CouponSpuCategory.java | 0 .../mall/sms/model/form/CouponForm.java | 0 .../mall/sms/model/query/AdvertPageQuery.java | 0 .../mall/sms/model/query/CouponPageQuery.java | 0 .../mall/sms/model/vo/AdvertPageVO.java | 0 .../youlai/mall/sms/model/vo/BannerVO.java | 0 .../mall/sms/model/vo/CouponPageVO.java | 0 .../mall/sms/service/AdvertService.java | 0 .../sms/service/CouponHistoryService.java | 0 .../mall/sms/service/CouponService.java | 0 .../sms/service/CouponSpuCategoryService.java | 0 .../mall/sms/service/CouponSpuService.java | 0 .../sms/service/impl/AdvertServiceImpl.java | 0 .../impl/CouponHistoryServiceImpl.java | 0 .../sms/service/impl/CouponServiceImpl.java | 0 .../impl/CouponSpuCategoryServiceImpl.java | 0 .../service/impl/CouponSpuServiceImpl.java | 0 .../com/youlai/mall/sms/util/CouponUtils.java | 0 .../src/main/resources/bootstrap-dev.yml | 0 .../src/main/resources/bootstrap-prod.yml | 0 .../src/main/resources/bootstrap.yml | 2 +- .../main/resources/mapper/AdvertMapper.xml | 0 .../resources/mapper/CouponHistoryMapper.xml | 0 .../main/resources/mapper/CouponMapper.xml | 0 .../mapper/CouponSpuCategoryMapper.xml | 0 .../main/resources/mapper/CouponSpuMapper.xml | 0 .../youlai/mall/sms/SalesApplicationTest.java | 2 +- pom.xml | 4 ++-- 56 files changed, 36 insertions(+), 28 deletions(-) rename {mall-marketing => mall-sales}/pom.xml (80%) rename {mall-marketing/marketing-api => mall-sales/sales-api}/pom.xml (93%) rename {mall-marketing/marketing-api => mall-sales/sales-api}/src/main/java/com/youlai/mall/marketing/api/CouponRecordFeignClient.java (96%) rename {mall-marketing/marketing-boot => mall-sales/sales-boot}/Dockerfile (96%) rename {mall-marketing/marketing-boot => mall-sales/sales-boot}/pom.xml (94%) rename mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/MarketingApplication.java => mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/SalesApplication.java (88%) rename {mall-marketing/marketing-boot => mall-sales/sales-boot}/src/main/java/com/youlai/mall/sms/controller/admin/AdvertController.java (100%) rename {mall-marketing/marketing-boot => mall-sales/sales-boot}/src/main/java/com/youlai/mall/sms/controller/admin/CouponController.java (100%) rename {mall-marketing/marketing-boot => mall-sales/sales-boot}/src/main/java/com/youlai/mall/sms/controller/app/AdvertAppController.java (100%) rename {mall-marketing/marketing-boot => mall-sales/sales-boot}/src/main/java/com/youlai/mall/sms/converter/AdvertConverter.java (100%) rename {mall-marketing/marketing-boot => mall-sales/sales-boot}/src/main/java/com/youlai/mall/sms/converter/CouponConverter.java (100%) rename {mall-marketing/marketing-boot => mall-sales/sales-boot}/src/main/java/com/youlai/mall/sms/enums/CouponApplicationScopeEnum.java (100%) rename {mall-marketing/marketing-boot => mall-sales/sales-boot}/src/main/java/com/youlai/mall/sms/enums/CouponFaceValueTypeEnum.java (100%) rename {mall-marketing/marketing-boot => mall-sales/sales-boot}/src/main/java/com/youlai/mall/sms/enums/CouponTypeEnum.java (100%) rename {mall-marketing/marketing-boot => mall-sales/sales-boot}/src/main/java/com/youlai/mall/sms/enums/PlatformEnum.java (100%) rename {mall-marketing/marketing-boot => mall-sales/sales-boot}/src/main/java/com/youlai/mall/sms/enums/ValidityPeriodTypeEnum.java (100%) rename {mall-marketing/marketing-boot => mall-sales/sales-boot}/src/main/java/com/youlai/mall/sms/mapper/AdvertMapper.java (100%) rename {mall-marketing/marketing-boot => mall-sales/sales-boot}/src/main/java/com/youlai/mall/sms/mapper/CouponHistoryMapper.java (100%) rename {mall-marketing/marketing-boot => mall-sales/sales-boot}/src/main/java/com/youlai/mall/sms/mapper/CouponMapper.java (100%) rename {mall-marketing/marketing-boot => mall-sales/sales-boot}/src/main/java/com/youlai/mall/sms/mapper/CouponSpuCategoryMapper.java (100%) rename {mall-marketing/marketing-boot => mall-sales/sales-boot}/src/main/java/com/youlai/mall/sms/mapper/CouponSpuMapper.java (100%) rename {mall-marketing/marketing-boot => mall-sales/sales-boot}/src/main/java/com/youlai/mall/sms/model/entity/Advert.java (100%) rename {mall-marketing/marketing-boot => mall-sales/sales-boot}/src/main/java/com/youlai/mall/sms/model/entity/Coupon.java (100%) rename {mall-marketing/marketing-boot => mall-sales/sales-boot}/src/main/java/com/youlai/mall/sms/model/entity/CouponHistory.java (100%) rename {mall-marketing/marketing-boot => mall-sales/sales-boot}/src/main/java/com/youlai/mall/sms/model/entity/CouponSpu.java (100%) rename {mall-marketing/marketing-boot => mall-sales/sales-boot}/src/main/java/com/youlai/mall/sms/model/entity/CouponSpuCategory.java (100%) rename {mall-marketing/marketing-boot => mall-sales/sales-boot}/src/main/java/com/youlai/mall/sms/model/form/CouponForm.java (100%) rename {mall-marketing/marketing-boot => mall-sales/sales-boot}/src/main/java/com/youlai/mall/sms/model/query/AdvertPageQuery.java (100%) rename {mall-marketing/marketing-boot => mall-sales/sales-boot}/src/main/java/com/youlai/mall/sms/model/query/CouponPageQuery.java (100%) rename {mall-marketing/marketing-boot => mall-sales/sales-boot}/src/main/java/com/youlai/mall/sms/model/vo/AdvertPageVO.java (100%) rename {mall-marketing/marketing-boot => mall-sales/sales-boot}/src/main/java/com/youlai/mall/sms/model/vo/BannerVO.java (100%) rename {mall-marketing/marketing-boot => mall-sales/sales-boot}/src/main/java/com/youlai/mall/sms/model/vo/CouponPageVO.java (100%) rename {mall-marketing/marketing-boot => mall-sales/sales-boot}/src/main/java/com/youlai/mall/sms/service/AdvertService.java (100%) rename {mall-marketing/marketing-boot => mall-sales/sales-boot}/src/main/java/com/youlai/mall/sms/service/CouponHistoryService.java (100%) rename {mall-marketing/marketing-boot => mall-sales/sales-boot}/src/main/java/com/youlai/mall/sms/service/CouponService.java (100%) rename {mall-marketing/marketing-boot => mall-sales/sales-boot}/src/main/java/com/youlai/mall/sms/service/CouponSpuCategoryService.java (100%) rename {mall-marketing/marketing-boot => mall-sales/sales-boot}/src/main/java/com/youlai/mall/sms/service/CouponSpuService.java (100%) rename {mall-marketing/marketing-boot => mall-sales/sales-boot}/src/main/java/com/youlai/mall/sms/service/impl/AdvertServiceImpl.java (100%) rename {mall-marketing/marketing-boot => mall-sales/sales-boot}/src/main/java/com/youlai/mall/sms/service/impl/CouponHistoryServiceImpl.java (100%) rename {mall-marketing/marketing-boot => mall-sales/sales-boot}/src/main/java/com/youlai/mall/sms/service/impl/CouponServiceImpl.java (100%) rename {mall-marketing/marketing-boot => mall-sales/sales-boot}/src/main/java/com/youlai/mall/sms/service/impl/CouponSpuCategoryServiceImpl.java (100%) rename {mall-marketing/marketing-boot => mall-sales/sales-boot}/src/main/java/com/youlai/mall/sms/service/impl/CouponSpuServiceImpl.java (100%) rename {mall-marketing/marketing-boot => mall-sales/sales-boot}/src/main/java/com/youlai/mall/sms/util/CouponUtils.java (100%) rename {mall-marketing/marketing-boot => mall-sales/sales-boot}/src/main/resources/bootstrap-dev.yml (100%) rename {mall-marketing/marketing-boot => mall-sales/sales-boot}/src/main/resources/bootstrap-prod.yml (100%) rename {mall-marketing/marketing-boot => mall-sales/sales-boot}/src/main/resources/bootstrap.yml (67%) rename {mall-marketing/marketing-boot => mall-sales/sales-boot}/src/main/resources/mapper/AdvertMapper.xml (100%) rename {mall-marketing/marketing-boot => mall-sales/sales-boot}/src/main/resources/mapper/CouponHistoryMapper.xml (100%) rename {mall-marketing/marketing-boot => mall-sales/sales-boot}/src/main/resources/mapper/CouponMapper.xml (100%) rename {mall-marketing/marketing-boot => mall-sales/sales-boot}/src/main/resources/mapper/CouponSpuCategoryMapper.xml (100%) rename {mall-marketing/marketing-boot => mall-sales/sales-boot}/src/main/resources/mapper/CouponSpuMapper.xml (100%) rename mall-marketing/marketing-boot/src/test/java/com/youlai/mall/sms/MarketingApplicationTest.java => mall-sales/sales-boot/src/test/java/com/youlai/mall/sms/SalesApplicationTest.java (86%) diff --git a/README.md b/README.md index 18f861127..a895e22ad 100644 --- a/README.md +++ b/README.md @@ -68,9 +68,9 @@ youlai-mall ├── sql # SQL脚本 ├── mysql5 # MySQL5脚本 ├── mysql8 # MySQL8脚本 -├── mall-marketing # 营销服务(Sales Management Service) +├── mall-sales # 营销服务(Sales Management Service) ├── sms-api # 营销服务-Feign客户端 - ├── sms-boot # 营销服务-启动应用 + ├── sales-boot # 营销服务-启动应用 ├── mall-product # 商品服务(Product Management Service) ├── product-api # 商品服务-Feign客户端 ├── product-boot # 商品服务-启动应用 diff --git a/mall-product/product-boot/src/main/java/com/youlai/mall/product/controller/admin/AttributeController.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/controller/admin/AttributeController.java index c237ea6c2..a6c1b1b68 100644 --- a/mall-product/product-boot/src/main/java/com/youlai/mall/product/controller/admin/AttributeController.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/controller/admin/AttributeController.java @@ -52,7 +52,16 @@ public class AttributeController { return Result.judge(result); } - @ApiOperationSupport(order = 3) + @ApiOperationSupport(order = 2) + @Operation(summary = "获取属性组表单") + @GetMapping("/group/form") + public Result saveAttributeGroup(@RequestBody @Valid AttrGroupForm formData) { + boolean result = attrGroupService.saveAttributeGroup(formData); + return Result.judge(result); + } + + + @ApiOperationSupport(order = 4) @Operation(summary = "修改属性组") @PutMapping(value = "/group/{id}") public Result updateAttributeGroup(@Parameter(description = "属性组ID") @PathVariable Long id, @@ -61,7 +70,7 @@ public class AttributeController { return Result.judge(result); } - @ApiOperationSupport(order = 4) + @ApiOperationSupport(order = 5) @Operation(summary = "删除属性组") @DeleteMapping("/group/{ids}") public Result deleteAttributeGroups( @@ -71,7 +80,7 @@ public class AttributeController { return Result.success(); } - @ApiOperationSupport(order = 5) + @ApiOperationSupport(order = 6) @Operation(summary = "新增属性") @PostMapping public Result saveAttribute(@RequestBody @Valid AttrForm formData) { @@ -79,7 +88,7 @@ public class AttributeController { return Result.judge(result); } - @ApiOperationSupport(order = 6) + @ApiOperationSupport(order = 7) @Operation(summary = "属性表单数据") @GetMapping("/{id}/form") public Result getAttributeForm( @@ -89,7 +98,7 @@ public class AttributeController { return Result.success(formData); } - @ApiOperationSupport(order = 7) + @ApiOperationSupport(order = ) @Operation(summary = "修改属性") @PutMapping(value = "/{id}") public Result updateAttribute(@Parameter(description = "属性ID") @PathVariable Long id, @@ -98,7 +107,7 @@ public class AttributeController { return Result.judge(result); } - @ApiOperationSupport(order = 8) + @ApiOperationSupport(order = 9) @Operation(summary = "删除属性") @DeleteMapping("/{ids}") public Result deleteAttributes( diff --git a/mall-product/product-boot/src/main/java/com/youlai/mall/product/converter/SpecConverter.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/converter/SpecConverter.java index 5579653b1..e734b45b1 100644 --- a/mall-product/product-boot/src/main/java/com/youlai/mall/product/converter/SpecConverter.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/converter/SpecConverter.java @@ -11,7 +11,7 @@ import com.youlai.mall.product.model.bo.SpecBO; import org.mapstruct.Mapping; /** - * 转换器 + * 规格转换器 * * @author Ray Hao * @since 2024-06-13 @@ -20,7 +20,7 @@ import org.mapstruct.Mapping; public interface SpecConverter { @Mapping(target = "inputTypeLabel", - expression = "java(bo.getInputType()!=null ? bo.getInputType().getLabel(): Strings.EMPTY)" + expression = "java(bo.getInputType()!=null ? bo.getInputType().getLabel(): \"\")" ) SpecPageVO toPageVo(SpecBO bo); @@ -28,6 +28,5 @@ public interface SpecConverter { SpecForm toForm(Spec entity); - @InheritInverseConfiguration(name = "toForm") - Spec toEntity(SpecForm entity); + Spec toEntity(SpecForm formData); } \ No newline at end of file diff --git a/mall-marketing/pom.xml b/mall-sales/pom.xml similarity index 80% rename from mall-marketing/pom.xml rename to mall-sales/pom.xml index 813f41b52..fd045c12b 100644 --- a/mall-marketing/pom.xml +++ b/mall-sales/pom.xml @@ -9,12 +9,12 @@ 4.0.0 - mall-marketing + mall-sales pom - marketing-api - marketing-boot + sales-api + sales-boot diff --git a/mall-marketing/marketing-api/pom.xml b/mall-sales/sales-api/pom.xml similarity index 93% rename from mall-marketing/marketing-api/pom.xml rename to mall-sales/sales-api/pom.xml index 9deb455d0..46259e778 100644 --- a/mall-marketing/marketing-api/pom.xml +++ b/mall-sales/sales-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-marketing + mall-sales com.youlai 3.2.1 4.0.0 - marketing-api + sales-api diff --git a/mall-marketing/marketing-api/src/main/java/com/youlai/mall/marketing/api/CouponRecordFeignClient.java b/mall-sales/sales-api/src/main/java/com/youlai/mall/marketing/api/CouponRecordFeignClient.java similarity index 96% rename from mall-marketing/marketing-api/src/main/java/com/youlai/mall/marketing/api/CouponRecordFeignClient.java rename to mall-sales/sales-api/src/main/java/com/youlai/mall/marketing/api/CouponRecordFeignClient.java index 080a447b0..76cbd56cd 100644 --- a/mall-marketing/marketing-api/src/main/java/com/youlai/mall/marketing/api/CouponRecordFeignClient.java +++ b/mall-sales/sales-api/src/main/java/com/youlai/mall/marketing/api/CouponRecordFeignClient.java @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @author huawei * @since 2021/3/17 */ -@FeignClient(value = "mall-marketing") +@FeignClient(value = "mall-sales") public interface CouponRecordFeignClient { @GetMapping("/api.app/v1/coupon_record/list") diff --git a/mall-marketing/marketing-boot/Dockerfile b/mall-sales/sales-boot/Dockerfile similarity index 96% rename from mall-marketing/marketing-boot/Dockerfile rename to mall-sales/sales-boot/Dockerfile index 94599c9c7..94a9a176d 100644 --- a/mall-marketing/marketing-boot/Dockerfile +++ b/mall-sales/sales-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/sms-boot.jar app.jar +ADD target/sales-boot.jar app.jar # 容器启动执行命令 CMD java \ diff --git a/mall-marketing/marketing-boot/pom.xml b/mall-sales/sales-boot/pom.xml similarity index 94% rename from mall-marketing/marketing-boot/pom.xml rename to mall-sales/sales-boot/pom.xml index abb7e68dc..8544cad53 100644 --- a/mall-marketing/marketing-boot/pom.xml +++ b/mall-sales/sales-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-marketing + mall-sales com.youlai 3.2.1 4.0.0 - marketing-boot + sales-boot 8804 @@ -55,7 +55,7 @@ com.youlai - marketing-api + sales-api diff --git a/mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/MarketingApplication.java b/mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/SalesApplication.java similarity index 88% rename from mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/MarketingApplication.java rename to mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/SalesApplication.java index d5711020e..47d69c39a 100644 --- a/mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/MarketingApplication.java +++ b/mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/SalesApplication.java @@ -16,9 +16,9 @@ import org.springframework.scheduling.annotation.EnableScheduling; @EnableDiscoveryClient @EnableFeignClients @EnableScheduling -public class MarketingApplication { +public class SalesApplication { public static void main(String[] args) { - SpringApplication.run(MarketingApplication.class, args); + SpringApplication.run(SalesApplication.class, args); } } diff --git a/mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/controller/admin/AdvertController.java b/mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/controller/admin/AdvertController.java similarity index 100% rename from mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/controller/admin/AdvertController.java rename to mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/controller/admin/AdvertController.java diff --git a/mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/controller/admin/CouponController.java b/mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/controller/admin/CouponController.java similarity index 100% rename from mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/controller/admin/CouponController.java rename to mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/controller/admin/CouponController.java diff --git a/mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/controller/app/AdvertAppController.java b/mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/controller/app/AdvertAppController.java similarity index 100% rename from mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/controller/app/AdvertAppController.java rename to mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/controller/app/AdvertAppController.java diff --git a/mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/converter/AdvertConverter.java b/mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/converter/AdvertConverter.java similarity index 100% rename from mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/converter/AdvertConverter.java rename to mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/converter/AdvertConverter.java diff --git a/mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/converter/CouponConverter.java b/mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/converter/CouponConverter.java similarity index 100% rename from mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/converter/CouponConverter.java rename to mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/converter/CouponConverter.java diff --git a/mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/enums/CouponApplicationScopeEnum.java b/mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/enums/CouponApplicationScopeEnum.java similarity index 100% rename from mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/enums/CouponApplicationScopeEnum.java rename to mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/enums/CouponApplicationScopeEnum.java diff --git a/mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/enums/CouponFaceValueTypeEnum.java b/mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/enums/CouponFaceValueTypeEnum.java similarity index 100% rename from mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/enums/CouponFaceValueTypeEnum.java rename to mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/enums/CouponFaceValueTypeEnum.java diff --git a/mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/enums/CouponTypeEnum.java b/mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/enums/CouponTypeEnum.java similarity index 100% rename from mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/enums/CouponTypeEnum.java rename to mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/enums/CouponTypeEnum.java diff --git a/mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/enums/PlatformEnum.java b/mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/enums/PlatformEnum.java similarity index 100% rename from mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/enums/PlatformEnum.java rename to mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/enums/PlatformEnum.java diff --git a/mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/enums/ValidityPeriodTypeEnum.java b/mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/enums/ValidityPeriodTypeEnum.java similarity index 100% rename from mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/enums/ValidityPeriodTypeEnum.java rename to mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/enums/ValidityPeriodTypeEnum.java diff --git a/mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/mapper/AdvertMapper.java b/mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/mapper/AdvertMapper.java similarity index 100% rename from mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/mapper/AdvertMapper.java rename to mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/mapper/AdvertMapper.java diff --git a/mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/mapper/CouponHistoryMapper.java b/mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/mapper/CouponHistoryMapper.java similarity index 100% rename from mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/mapper/CouponHistoryMapper.java rename to mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/mapper/CouponHistoryMapper.java diff --git a/mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/mapper/CouponMapper.java b/mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/mapper/CouponMapper.java similarity index 100% rename from mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/mapper/CouponMapper.java rename to mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/mapper/CouponMapper.java diff --git a/mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/mapper/CouponSpuCategoryMapper.java b/mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/mapper/CouponSpuCategoryMapper.java similarity index 100% rename from mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/mapper/CouponSpuCategoryMapper.java rename to mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/mapper/CouponSpuCategoryMapper.java diff --git a/mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/mapper/CouponSpuMapper.java b/mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/mapper/CouponSpuMapper.java similarity index 100% rename from mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/mapper/CouponSpuMapper.java rename to mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/mapper/CouponSpuMapper.java diff --git a/mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/model/entity/Advert.java b/mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/model/entity/Advert.java similarity index 100% rename from mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/model/entity/Advert.java rename to mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/model/entity/Advert.java diff --git a/mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/model/entity/Coupon.java b/mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/model/entity/Coupon.java similarity index 100% rename from mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/model/entity/Coupon.java rename to mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/model/entity/Coupon.java diff --git a/mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/model/entity/CouponHistory.java b/mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/model/entity/CouponHistory.java similarity index 100% rename from mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/model/entity/CouponHistory.java rename to mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/model/entity/CouponHistory.java diff --git a/mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/model/entity/CouponSpu.java b/mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/model/entity/CouponSpu.java similarity index 100% rename from mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/model/entity/CouponSpu.java rename to mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/model/entity/CouponSpu.java diff --git a/mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/model/entity/CouponSpuCategory.java b/mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/model/entity/CouponSpuCategory.java similarity index 100% rename from mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/model/entity/CouponSpuCategory.java rename to mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/model/entity/CouponSpuCategory.java diff --git a/mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/model/form/CouponForm.java b/mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/model/form/CouponForm.java similarity index 100% rename from mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/model/form/CouponForm.java rename to mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/model/form/CouponForm.java diff --git a/mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/model/query/AdvertPageQuery.java b/mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/model/query/AdvertPageQuery.java similarity index 100% rename from mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/model/query/AdvertPageQuery.java rename to mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/model/query/AdvertPageQuery.java diff --git a/mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/model/query/CouponPageQuery.java b/mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/model/query/CouponPageQuery.java similarity index 100% rename from mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/model/query/CouponPageQuery.java rename to mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/model/query/CouponPageQuery.java diff --git a/mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/model/vo/AdvertPageVO.java b/mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/model/vo/AdvertPageVO.java similarity index 100% rename from mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/model/vo/AdvertPageVO.java rename to mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/model/vo/AdvertPageVO.java diff --git a/mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/model/vo/BannerVO.java b/mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/model/vo/BannerVO.java similarity index 100% rename from mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/model/vo/BannerVO.java rename to mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/model/vo/BannerVO.java diff --git a/mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/model/vo/CouponPageVO.java b/mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/model/vo/CouponPageVO.java similarity index 100% rename from mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/model/vo/CouponPageVO.java rename to mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/model/vo/CouponPageVO.java diff --git a/mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/service/AdvertService.java b/mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/service/AdvertService.java similarity index 100% rename from mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/service/AdvertService.java rename to mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/service/AdvertService.java diff --git a/mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/service/CouponHistoryService.java b/mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/service/CouponHistoryService.java similarity index 100% rename from mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/service/CouponHistoryService.java rename to mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/service/CouponHistoryService.java diff --git a/mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/service/CouponService.java b/mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/service/CouponService.java similarity index 100% rename from mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/service/CouponService.java rename to mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/service/CouponService.java diff --git a/mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/service/CouponSpuCategoryService.java b/mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/service/CouponSpuCategoryService.java similarity index 100% rename from mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/service/CouponSpuCategoryService.java rename to mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/service/CouponSpuCategoryService.java diff --git a/mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/service/CouponSpuService.java b/mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/service/CouponSpuService.java similarity index 100% rename from mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/service/CouponSpuService.java rename to mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/service/CouponSpuService.java diff --git a/mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/service/impl/AdvertServiceImpl.java b/mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/service/impl/AdvertServiceImpl.java similarity index 100% rename from mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/service/impl/AdvertServiceImpl.java rename to mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/service/impl/AdvertServiceImpl.java diff --git a/mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/service/impl/CouponHistoryServiceImpl.java b/mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/service/impl/CouponHistoryServiceImpl.java similarity index 100% rename from mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/service/impl/CouponHistoryServiceImpl.java rename to mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/service/impl/CouponHistoryServiceImpl.java diff --git a/mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/service/impl/CouponServiceImpl.java b/mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/service/impl/CouponServiceImpl.java similarity index 100% rename from mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/service/impl/CouponServiceImpl.java rename to mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/service/impl/CouponServiceImpl.java diff --git a/mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/service/impl/CouponSpuCategoryServiceImpl.java b/mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/service/impl/CouponSpuCategoryServiceImpl.java similarity index 100% rename from mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/service/impl/CouponSpuCategoryServiceImpl.java rename to mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/service/impl/CouponSpuCategoryServiceImpl.java diff --git a/mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/service/impl/CouponSpuServiceImpl.java b/mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/service/impl/CouponSpuServiceImpl.java similarity index 100% rename from mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/service/impl/CouponSpuServiceImpl.java rename to mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/service/impl/CouponSpuServiceImpl.java diff --git a/mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/util/CouponUtils.java b/mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/util/CouponUtils.java similarity index 100% rename from mall-marketing/marketing-boot/src/main/java/com/youlai/mall/sms/util/CouponUtils.java rename to mall-sales/sales-boot/src/main/java/com/youlai/mall/sms/util/CouponUtils.java diff --git a/mall-marketing/marketing-boot/src/main/resources/bootstrap-dev.yml b/mall-sales/sales-boot/src/main/resources/bootstrap-dev.yml similarity index 100% rename from mall-marketing/marketing-boot/src/main/resources/bootstrap-dev.yml rename to mall-sales/sales-boot/src/main/resources/bootstrap-dev.yml diff --git a/mall-marketing/marketing-boot/src/main/resources/bootstrap-prod.yml b/mall-sales/sales-boot/src/main/resources/bootstrap-prod.yml similarity index 100% rename from mall-marketing/marketing-boot/src/main/resources/bootstrap-prod.yml rename to mall-sales/sales-boot/src/main/resources/bootstrap-prod.yml diff --git a/mall-marketing/marketing-boot/src/main/resources/bootstrap.yml b/mall-sales/sales-boot/src/main/resources/bootstrap.yml similarity index 67% rename from mall-marketing/marketing-boot/src/main/resources/bootstrap.yml rename to mall-sales/sales-boot/src/main/resources/bootstrap.yml index 8dbb58c87..60112e8fc 100644 --- a/mall-marketing/marketing-boot/src/main/resources/bootstrap.yml +++ b/mall-sales/sales-boot/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ spring: application: - name: mall-marketing + name: mall-sales profiles: active: dev diff --git a/mall-marketing/marketing-boot/src/main/resources/mapper/AdvertMapper.xml b/mall-sales/sales-boot/src/main/resources/mapper/AdvertMapper.xml similarity index 100% rename from mall-marketing/marketing-boot/src/main/resources/mapper/AdvertMapper.xml rename to mall-sales/sales-boot/src/main/resources/mapper/AdvertMapper.xml diff --git a/mall-marketing/marketing-boot/src/main/resources/mapper/CouponHistoryMapper.xml b/mall-sales/sales-boot/src/main/resources/mapper/CouponHistoryMapper.xml similarity index 100% rename from mall-marketing/marketing-boot/src/main/resources/mapper/CouponHistoryMapper.xml rename to mall-sales/sales-boot/src/main/resources/mapper/CouponHistoryMapper.xml diff --git a/mall-marketing/marketing-boot/src/main/resources/mapper/CouponMapper.xml b/mall-sales/sales-boot/src/main/resources/mapper/CouponMapper.xml similarity index 100% rename from mall-marketing/marketing-boot/src/main/resources/mapper/CouponMapper.xml rename to mall-sales/sales-boot/src/main/resources/mapper/CouponMapper.xml diff --git a/mall-marketing/marketing-boot/src/main/resources/mapper/CouponSpuCategoryMapper.xml b/mall-sales/sales-boot/src/main/resources/mapper/CouponSpuCategoryMapper.xml similarity index 100% rename from mall-marketing/marketing-boot/src/main/resources/mapper/CouponSpuCategoryMapper.xml rename to mall-sales/sales-boot/src/main/resources/mapper/CouponSpuCategoryMapper.xml diff --git a/mall-marketing/marketing-boot/src/main/resources/mapper/CouponSpuMapper.xml b/mall-sales/sales-boot/src/main/resources/mapper/CouponSpuMapper.xml similarity index 100% rename from mall-marketing/marketing-boot/src/main/resources/mapper/CouponSpuMapper.xml rename to mall-sales/sales-boot/src/main/resources/mapper/CouponSpuMapper.xml diff --git a/mall-marketing/marketing-boot/src/test/java/com/youlai/mall/sms/MarketingApplicationTest.java b/mall-sales/sales-boot/src/test/java/com/youlai/mall/sms/SalesApplicationTest.java similarity index 86% rename from mall-marketing/marketing-boot/src/test/java/com/youlai/mall/sms/MarketingApplicationTest.java rename to mall-sales/sales-boot/src/test/java/com/youlai/mall/sms/SalesApplicationTest.java index 0b400249c..e86710007 100644 --- a/mall-marketing/marketing-boot/src/test/java/com/youlai/mall/sms/MarketingApplicationTest.java +++ b/mall-sales/sales-boot/src/test/java/com/youlai/mall/sms/SalesApplicationTest.java @@ -9,7 +9,7 @@ import org.springframework.boot.test.context.SpringBootTest; * @since 2021/7/3 */ @SpringBootTest -public class MarketingApplicationTest { +public class SalesApplicationTest { @Test public void contestLoad(){ diff --git a/pom.xml b/pom.xml index fb308a8c4..289c03dd0 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ youlai-auth - mall-marketing + mall-sales mall-member mall-product mall-order @@ -244,7 +244,7 @@ com.youlai - marketing-api + sales-api ${project.version}