Merge branch 'master-new' of https://gitee.com/zhijiantianya/onemall into master-new

docs/sql/old/mall_promotion.sql

@@ -157,8 +157,8 @@ DROP TABLE IF EXISTS `promotion_activity`;
 CREATE TABLE `promotion_activity` (
   `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '活动编号',
   `title` varchar(50) NOT NULL DEFAULT '' COMMENT '活动标题',
-  `activity_type` tinyint(4) NOT NULL COMMENT '活动类型\n     *\n     * 参见 {@link cn.iocoder.mall.promotion.api.constant.PromotionActivityTypeEnum} 枚举',
+  `activity_type` tinyint(4) NOT NULL COMMENT '活动类型\n     *\n     * 参见 {@link cn.iocoder.mall.promotion.api.enums.PromotionActivityTypeEnum} 枚举',
-  `status` tinyint(4) NOT NULL DEFAULT '-1' COMMENT '活动状态\n     *\n     * 参见 {@link cn.iocoder.mall.promotion.api.constant.PromotionActivityStatusEnum} 枚举',
+  `status` tinyint(4) NOT NULL DEFAULT '-1' COMMENT '活动状态\n     *\n     * 参见 {@link cn.iocoder.mall.promotion.api.enums.PromotionActivityStatusEnum} 枚举',
   `start_time` datetime NOT NULL COMMENT '开始时间',
   `end_time` datetime NOT NULL COMMENT '结束时间',
   `invalid_time` datetime DEFAULT NULL COMMENT '失效时间',

order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/CartServiceImpl.java

@@ -19,7 +19,7 @@ import cn.iocoder.mall.promotion.api.CouponService;
 import cn.iocoder.mall.promotion.api.PromotionActivityService;
 import cn.iocoder.mall.promotion.api.bo.CouponCardDetailBO;
 import cn.iocoder.mall.promotion.api.bo.PromotionActivityBO;
-import cn.iocoder.mall.promotion.api.constant.*;
+import cn.iocoder.mall.promotion.api.enums.*;
 import org.apache.dubbo.config.annotation.Reference;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

pom.xml

@@ -30,6 +30,7 @@
         <module>management-web-app</module>
         <module>shop-web-app</module>
         <module>product-service-project</module>
+        <module>promotion-service-project</module>
     </modules>
     <packaging>pom</packaging>
 

promotion-service-project/pom.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         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">
+    <parent>
+        <artifactId>onemall</artifactId>
+        <groupId>cn.iocoder.mall</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>promotion-service-project</artifactId>
+    <packaging>pom</packaging>
+    <modules>
+        <module>promotion-service-api</module>
+        <module>promotion-service-app</module>
+    </modules>
+
+    <dependencyManagement>
+        <dependencies>
+            <!-- onemall 基础 bom 文件  -->
+            <dependency>
+                <groupId>cn.iocoder.mall</groupId>
+                <artifactId>mall-dependencies</artifactId>
+                <version>1.0-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>cn.iocoder.mall</groupId>
+                <artifactId>common-framework</artifactId>
+                <version>1.0-SNAPSHOT</version>
+            </dependency>
+
+            <!-- 自身项目 -->
+            <dependency>
+                <groupId>cn.iocoder.mall</groupId>
+                <artifactId>promotion-service-api</artifactId>
+                <version>1.0-SNAPSHOT</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+</project>

promotion-service-project/promotion-service-api/pom.xml

@@ -33,6 +33,17 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>javax.validation</groupId>
+            <artifactId>validation-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>

promotion-service-project/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/enums/CouponCardStatusEnum.java

@@ -1,4 +1,4 @@
-package cn.iocoder.mall.promotion.api.constant;
+package cn.iocoder.mall.promotion.api.enums;
 
 import cn.iocoder.common.framework.core.IntArrayValuable;
 

promotion-service-project/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/enums/CouponCardTakeTypeEnum.java

@@ -1,4 +1,4 @@
-package cn.iocoder.mall.promotion.api.constant;
+package cn.iocoder.mall.promotion.api.enums;
 
 import cn.iocoder.common.framework.core.IntArrayValuable;
 

promotion-service-project/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/enums/CouponTemplateDateTypeEnum.java

@@ -1,4 +1,4 @@
-package cn.iocoder.mall.promotion.api.constant;
+package cn.iocoder.mall.promotion.api.enums;
 
 import cn.iocoder.common.framework.core.IntArrayValuable;
 

promotion-service-project/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/enums/CouponTemplateStatusEnum.java

@@ -1,4 +1,4 @@
-package cn.iocoder.mall.promotion.api.constant;
+package cn.iocoder.mall.promotion.api.enums;
 
 import cn.iocoder.common.framework.core.IntArrayValuable;
 

promotion-service-project/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/enums/CouponTemplateTypeEnum.java

@@ -1,4 +1,4 @@
-package cn.iocoder.mall.promotion.api.constant;
+package cn.iocoder.mall.promotion.api.enums;
 
 import java.util.Arrays;
 

promotion-service-project/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/enums/MeetTypeEnum.java

@@ -1,4 +1,4 @@
-package cn.iocoder.mall.promotion.api.constant;
+package cn.iocoder.mall.promotion.api.enums;
 
 /**
  * 匹配类型枚举

promotion-service-project/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/enums/PreferentialTypeEnum.java

@@ -1,4 +1,4 @@
-package cn.iocoder.mall.promotion.api.constant;
+package cn.iocoder.mall.promotion.api.enums;
 
 import cn.iocoder.common.framework.core.IntArrayValuable;
 

promotion-service-project/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/enums/ProductRecommendTypeEnum.java

@@ -1,4 +1,4 @@
-package cn.iocoder.mall.promotion.api.constant;
+package cn.iocoder.mall.promotion.api.enums;
 
 import cn.iocoder.common.framework.core.IntArrayValuable;
 

promotion-service-project/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/enums/PromotionActivityStatusEnum.java

@@ -1,4 +1,4 @@
-package cn.iocoder.mall.promotion.api.constant;
+package cn.iocoder.mall.promotion.api.enums;
 
 /**
  * 促销活动状态枚举

promotion-service-project/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/enums/PromotionActivityTypeEnum.java

@@ -1,4 +1,4 @@
-package cn.iocoder.mall.promotion.api.constant;
+package cn.iocoder.mall.promotion.api.enums;
 
 /**
  * 推广活动类型枚举

promotion-service-project/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/enums/PromotionErrorCodeEnum.java

@@ -1,4 +1,4 @@
-package cn.iocoder.mall.promotion.api.constant;
+package cn.iocoder.mall.promotion.api.enums;
 
 /**
  * 错误码枚举类

promotion-service-project/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/enums/RangeTypeEnum.java

@@ -1,4 +1,4 @@
-package cn.iocoder.mall.promotion.api.constant;
+package cn.iocoder.mall.promotion.api.enums;
 
 import cn.iocoder.common.framework.core.IntArrayValuable;
 

promotion-service-project/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/rpc/activity/PromotionActivityService.java

@@ -0,0 +1,16 @@
+package cn.iocoder.mall.promotion.api.rpc.activity.dto;
+
+import java.util.Collection;
+import java.util.List;
+
+public interface PromotionActivityService {
+
+    List<PromotionActivityRespDTO> getPromotionActivityListBySpuId(Integer spuId,
+                                                                   Collection<Integer> activityStatuses);
+
+    List<PromotionActivityRespDTO> getPromotionActivityListBySpuIds(Collection<Integer> spuIds,
+                                                                    Collection<Integer> activityStatuses);
+
+    PromotionActivityPageReqDTO getPromotionActivityPage(PromotionActivityPageRespDTO promotionActivityPageDTO);
+
+}

promotion-service-project/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/rpc/activity/dto/PromotionActivityPageReqDTO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.mall.promotion.api.bo;
+package cn.iocoder.mall.promotion.api.rpc.activity.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -10,12 +10,12 @@ import java.util.List;
  */
 @Data
 @Accessors(chain = true)
-public class PromotionActivityPageBO {
+public class PromotionActivityPageReqDTO {
 
     /**
      * PromotionActivityBO 数组
      */
-    private List<PromotionActivityBO> list;
+    private List<PromotionActivityRespDTO> list;
     /**
      * 总量
      */

promotion-service-project/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/rpc/activity/dto/PromotionActivityPageRespDTO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.mall.promotion.api.dto;
+package cn.iocoder.mall.promotion.api.rpc.activity.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -12,7 +12,7 @@ import java.util.Collection;
  */
 @Data
 @Accessors(chain = true)
-public class PromotionActivityPageDTO implements Serializable {
+public class PromotionActivityPageRespDTO implements Serializable {
 
     /**
      * 标题

promotion-service-project/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/rpc/activity/dto/PromotionActivityRespDTO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.mall.promotion.api.bo;
+package cn.iocoder.mall.promotion.api.rpc.activity.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -9,7 +9,7 @@ import java.util.List;
 
 @Data
 @Accessors(chain = true)
-public class PromotionActivityBO implements Serializable {
+public class PromotionActivityRespDTO implements Serializable {
 
     /**
      * 活动编号
@@ -22,13 +22,13 @@ public class PromotionActivityBO implements Serializable {
     /**
      * 活动类型
      *
-     * 参见 {@link cn.iocoder.mall.promotion.api.constant.PromotionActivityTypeEnum} 枚举
+     * 参见 {@link cn.iocoder.mall.promotion.api.enums.PromotionActivityTypeEnum} 枚举
      */
     private Integer activityType;
     /**
      * 活动状态
      *
-     * 参见 {@link cn.iocoder.mall.promotion.api.constant.PromotionActivityStatusEnum} 枚举
+     * 参见 {@link cn.iocoder.mall.promotion.api.enums.PromotionActivityStatusEnum} 枚举
      */
     private Integer status;
     /**
@@ -129,7 +129,7 @@ public class PromotionActivityBO implements Serializable {
         /**
          * 可用范围的类型
          *
-         * 参见 {@link cn.iocoder.mall.promotion.api.constant.RangeTypeEnum} 枚举
+         * 参见 {@link cn.iocoder.mall.promotion.api.enums.RangeTypeEnum} 枚举
          * 暂时只用 “所有可用” + “PRODUCT_INCLUDE_PRT”
          */
         private Integer rangeType;

promotion-service-project/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/rpc/banner/BannerService.java

@@ -0,0 +1,28 @@
+package cn.iocoder.mall.promotion.api.rpc.banner;
+
+import cn.iocoder.common.framework.enums.CommonStatusEnum;
+import cn.iocoder.common.framework.validator.InEnum;
+import cn.iocoder.mall.promotion.api.rpc.banner.dto.BannerRespDTO;
+import cn.iocoder.mall.promotion.api.rpc.banner.dto.BannerPageRespDTO;
+import cn.iocoder.mall.promotion.api.rpc.banner.dto.BannerAddReqDTO;
+import cn.iocoder.mall.promotion.api.rpc.banner.dto.BannerPageDTO;
+import cn.iocoder.mall.promotion.api.rpc.banner.dto.BannerUpdateReqDTO;
+
+import java.util.List;
+
+public interface BannerService {
+
+    List<BannerRespDTO> getBannerListByStatus(Integer status);
+
+    BannerPageRespDTO getBannerPage(BannerPageDTO bannerPageDTO);
+
+    BannerRespDTO addBanner(Integer adminId, BannerAddReqDTO bannerAddDTO);
+
+    Boolean updateBanner(Integer adminId, BannerUpdateReqDTO bannerUpdateDTO);
+
+    Boolean updateBannerStatus(Integer adminId, Integer bannerId,
+                               @InEnum(value = CommonStatusEnum.class, message = "修改状态必须是 {value}") Integer status);
+
+    Boolean deleteBanner(Integer adminId, Integer bannerId);
+
+}

promotion-service-project/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/rpc/banner/dto/BannerAddReqDTO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.mall.promotion.api.dto;
+package cn.iocoder.mall.promotion.api.rpc.banner.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -14,7 +14,7 @@ import java.io.Serializable;
  */
 @Data
 @Accessors(chain = true)
-public class BannerAddDTO implements Serializable {
+public class BannerAddReqDTO implements Serializable {
 
     @NotEmpty(message = "标题不能为空")
     @Length(min = 2, max = 32, message = "标题长度为 2-32 位")

promotion-service-project/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/rpc/banner/dto/BannerPageDTO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.mall.promotion.api.dto;
+package cn.iocoder.mall.promotion.api.rpc.banner.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;

promotion-service-project/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/rpc/banner/dto/BannerPageRespDTO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.mall.promotion.api.bo;
+package cn.iocoder.mall.promotion.api.rpc.banner.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -11,12 +11,12 @@ import java.util.List;
  */
 @Data
 @Accessors(chain = true)
-public class BannerPageBO implements Serializable {
+public class BannerPageRespDTO implements Serializable {
 
     /**
      * Banner 数组
      */
-    private List<BannerBO> list;
+    private List<BannerRespDTO> list;
     /**
      * 总量
      */

promotion-service-project/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/rpc/banner/dto/BannerRespDTO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.mall.promotion.api.bo;
+package cn.iocoder.mall.promotion.api.rpc.banner.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -11,7 +11,7 @@ import java.util.Date;
  */
 @Data
 @Accessors(chain = true)
-public class BannerBO implements Serializable {
+public class BannerRespDTO implements Serializable {
 
     /**
      * 编号

promotion-service-project/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/rpc/banner/dto/BannerUpdateReqDTO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.mall.promotion.api.dto;
+package cn.iocoder.mall.promotion.api.rpc.banner.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -14,7 +14,7 @@ import java.io.Serializable;
  */
 @Data
 @Accessors(chain = true)
-public class BannerUpdateDTO implements Serializable {
+public class BannerUpdateReqDTO implements Serializable {
 
     @NotNull(message = "编号不能为空")
     private Integer id;

promotion-service-project/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/rpc/coupon/CouponService.java

@@ -1,9 +1,8 @@
-package cn.iocoder.mall.promotion.api;
+package cn.iocoder.mall.promotion.api.rpc.coupon;
 
 import cn.iocoder.common.framework.validator.InEnum;
-import cn.iocoder.mall.promotion.api.bo.*;
+import cn.iocoder.mall.promotion.api.enums.CouponTemplateStatusEnum;
-import cn.iocoder.mall.promotion.api.constant.CouponTemplateStatusEnum;
+import cn.iocoder.mall.promotion.api.rpc.coupon.dto.*;
-import cn.iocoder.mall.promotion.api.dto.*;
 
 import javax.validation.constraints.NotNull;
 import java.util.List;
@@ -14,7 +13,7 @@ public interface CouponService {
 
     CouponTemplateBO getCouponTemplate(Integer couponTemplateId);
 
-    CouponTemplatePageBO getCouponTemplatePage(CouponTemplatePageDTO couponTemplatePageDTO);
+    CouponTemplatePageBO getCouponTemplatePage(CouponTemplatePageReqDTO couponTemplatePageDTO);
 
     /**
      * 创建优惠码模板
@@ -22,7 +21,7 @@ public interface CouponService {
      * @param couponCodeTemplateAddDTO 优惠码模板添加 DTO
      * @return 优惠码模板
      */
-    CouponTemplateBO addCouponCodeTemplate(CouponCodeTemplateAddDTO couponCodeTemplateAddDTO);
+    CouponTemplateBO addCouponCodeTemplate(CouponCodeTemplateAddReqDTO couponCodeTemplateAddDTO);
 
     /**
      * 创建优惠劵模板
@@ -30,7 +29,7 @@ public interface CouponService {
      * @param couponCardTemplateAddDTO 优惠码模板添加 DTO
      * @return 优惠劵模板
      */
-    CouponTemplateBO addCouponCardTemplate(CouponCardTemplateAddDTO couponCardTemplateAddDTO);
+    CouponTemplateBO addCouponCardTemplate(CouponCardTemplateAddReqDTO couponCardTemplateAddDTO);
 
     /**
      * 更新优惠码模板
@@ -38,7 +37,7 @@ public interface CouponService {
      * @param couponCodeTemplateUpdateDTO 优惠码模板修改 DTO
      * @return 是否成功
      */
-    Boolean updateCouponCodeTemplate(CouponCodeTemplateUpdateDTO couponCodeTemplateUpdateDTO);
+    Boolean updateCouponCodeTemplate(CouponCodeTemplateUpdateReqDTO couponCodeTemplateUpdateDTO);
 
     /**
      * 更新优惠劵模板
@@ -46,7 +45,7 @@ public interface CouponService {
      * @param couponCardTemplateUpdateDTO 优惠劵模板修改 DTO
      * @return 是否成功
      */
-    Boolean updateCouponCardTemplate(CouponCardTemplateUpdateDTO couponCardTemplateUpdateDTO);
+    Boolean updateCouponCardTemplate(CouponCardTemplateUpdateReqDTO couponCardTemplateUpdateDTO);
 
     /**
      * 更新优惠劵（码）模板的状态
@@ -61,7 +60,7 @@ public interface CouponService {
 
     // ========== 优惠劵 ==========
 
-    CouponCardPageBO getCouponCardPage(CouponCardPageDTO couponCardPageDTO);
+    CouponCardPageBO getCouponCardPage(CouponCardPageReqDTO couponCardPageDTO);
 
     /**
      * 基于优惠劵模板，领取优惠劵
@@ -109,7 +108,7 @@ public interface CouponService {
      * @param spus   匹配的商品/分类
      * @return 优惠劵列表
      */
-    List<CouponCardAvailableBO> getCouponCardList(Integer userId, List<CouponCardSpuDTO> spus);
+    List<CouponCardAvailableRespDTO> getCouponCardList(Integer userId, List<CouponCardSpuRespDTO> spus);
 
     // ========== 优惠码 ==========
 

promotion-service-project/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/rpc/coupon/dto/CouponCardAvailableRespDTO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.mall.promotion.api.bo;
+package cn.iocoder.mall.promotion.api.rpc.coupon.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -10,7 +10,7 @@ import lombok.experimental.Accessors;
  */
 @Data
 @Accessors(chain = true)
-public class CouponCardAvailableBO extends CouponCardBO {
+public class CouponCardAvailableRespDTO extends CouponCardBO {
 
     /**
      * 是否可用

promotion-service-project/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/rpc/coupon/dto/CouponCardBO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.mall.promotion.api.bo;
+package cn.iocoder.mall.promotion.api.rpc.coupon.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;

promotion-service-project/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/rpc/coupon/dto/CouponCardDetailBO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.mall.promotion.api.bo;
+package cn.iocoder.mall.promotion.api.rpc.coupon.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;

promotion-service-project/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/rpc/coupon/dto/CouponCardPageBO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.mall.promotion.api.bo;
+package cn.iocoder.mall.promotion.api.rpc.coupon.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;

promotion-service-project/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/rpc/coupon/dto/CouponCardPageReqDTO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.mall.promotion.api.dto;
+package cn.iocoder.mall.promotion.api.rpc.coupon.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -11,7 +11,7 @@ import java.io.Serializable;
  */
 @Data
 @Accessors(chain = true)
-public class CouponCardPageDTO implements Serializable {
+public class CouponCardPageReqDTO implements Serializable {
 
     /**
      * 用户编号

promotion-service-project/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/rpc/coupon/dto/CouponCardSpuRespDTO.java

@@ -1,5 +1,6 @@
-package cn.iocoder.mall.promotion.api.dto;
+package cn.iocoder.mall.promotion.api.rpc.coupon.dto;
 
+import cn.iocoder.mall.promotion.api.rpc.coupon.CouponService;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -9,11 +10,11 @@ import java.util.List;
 /**
  * 优惠劵商品 DTO
  *
- * 主要用于 {@link cn.iocoder.mall.promotion.api.CouponService#getCouponCardList(Integer, List)}
+ * 主要用于 {@link CouponService#getCouponCardList(Integer, List)}
  */
 @Data
 @Accessors(chain = true)
-public class CouponCardSpuDTO implements Serializable {
+public class CouponCardSpuRespDTO implements Serializable {
 
     /**
      * 商品 SPU 编号

promotion-service-project/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/rpc/coupon/dto/CouponCardTemplateAddReqDTO.java

@@ -1,9 +1,9 @@
-package cn.iocoder.mall.promotion.api.dto;
+package cn.iocoder.mall.promotion.api.rpc.coupon.dto;
 
 import cn.iocoder.common.framework.validator.InEnum;
-import cn.iocoder.mall.promotion.api.constant.CouponTemplateDateTypeEnum;
+import cn.iocoder.mall.promotion.api.enums.CouponTemplateDateTypeEnum;
-import cn.iocoder.mall.promotion.api.constant.PreferentialTypeEnum;
+import cn.iocoder.mall.promotion.api.enums.PreferentialTypeEnum;
-import cn.iocoder.mall.promotion.api.constant.RangeTypeEnum;
+import cn.iocoder.mall.promotion.api.enums.RangeTypeEnum;
 import lombok.Data;
 import lombok.experimental.Accessors;
 import org.hibernate.validator.constraints.Length;
@@ -20,7 +20,7 @@ import java.util.Date;
  */
 @Data
 @Accessors(chain = true)
-public class CouponCardTemplateAddDTO implements Serializable {
+public class CouponCardTemplateAddReqDTO implements Serializable {
 
     // ========== 基本信息 BEGIN ==========
     /**

promotion-service-project/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/rpc/coupon/dto/CouponCardTemplateUpdateReqDTO.java

@@ -1,7 +1,7 @@
-package cn.iocoder.mall.promotion.api.dto;
+package cn.iocoder.mall.promotion.api.rpc.coupon.dto;
 
 import cn.iocoder.common.framework.validator.InEnum;
-import cn.iocoder.mall.promotion.api.constant.RangeTypeEnum;
+import cn.iocoder.mall.promotion.api.enums.RangeTypeEnum;
 import lombok.Data;
 import lombok.experimental.Accessors;
 import org.hibernate.validator.constraints.Length;
@@ -16,7 +16,7 @@ import java.io.Serializable;
  */
 @Data
 @Accessors(chain = true)
-public class CouponCardTemplateUpdateDTO implements Serializable {
+public class CouponCardTemplateUpdateReqDTO implements Serializable {
 
     @NotNull(message = "编号不能为空")
     private Integer id;
@@ -143,7 +143,7 @@ public class CouponCardTemplateUpdateDTO implements Serializable {
         return id;
     }
 
-    public CouponCardTemplateUpdateDTO setId(Integer id) {
+    public CouponCardTemplateUpdateReqDTO setId(Integer id) {
         this.id = id;
         return this;
     }
@@ -152,7 +152,7 @@ public class CouponCardTemplateUpdateDTO implements Serializable {
         return title;
     }
 
-    public CouponCardTemplateUpdateDTO setTitle(String title) {
+    public CouponCardTemplateUpdateReqDTO setTitle(String title) {
         this.title = title;
         return this;
     }
@@ -161,7 +161,7 @@ public class CouponCardTemplateUpdateDTO implements Serializable {
         return description;
     }
 
-    public CouponCardTemplateUpdateDTO setDescription(String description) {
+    public CouponCardTemplateUpdateReqDTO setDescription(String description) {
         this.description = description;
         return this;
     }
@@ -170,7 +170,7 @@ public class CouponCardTemplateUpdateDTO implements Serializable {
         return quota;
     }
 
-    public CouponCardTemplateUpdateDTO setQuota(Integer quota) {
+    public CouponCardTemplateUpdateReqDTO setQuota(Integer quota) {
         this.quota = quota;
         return this;
     }
@@ -179,7 +179,7 @@ public class CouponCardTemplateUpdateDTO implements Serializable {
         return total;
     }
 
-    public CouponCardTemplateUpdateDTO setTotal(Integer total) {
+    public CouponCardTemplateUpdateReqDTO setTotal(Integer total) {
         this.total = total;
         return this;
     }
@@ -188,7 +188,7 @@ public class CouponCardTemplateUpdateDTO implements Serializable {
         return rangeType;
     }
 
-    public CouponCardTemplateUpdateDTO setRangeType(Integer rangeType) {
+    public CouponCardTemplateUpdateReqDTO setRangeType(Integer rangeType) {
         this.rangeType = rangeType;
         return this;
     }
@@ -197,7 +197,7 @@ public class CouponCardTemplateUpdateDTO implements Serializable {
         return rangeValues;
     }
 
-    public CouponCardTemplateUpdateDTO setRangeValues(String rangeValues) {
+    public CouponCardTemplateUpdateReqDTO setRangeValues(String rangeValues) {
         this.rangeValues = rangeValues;
         return this;
     }

promotion-service-project/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/rpc/coupon/dto/CouponCodeTemplateAddReqDTO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.mall.promotion.api.dto;
+package cn.iocoder.mall.promotion.api.rpc.coupon.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -10,5 +10,5 @@ import java.io.Serializable;
  */
 @Data
 @Accessors(chain = true)
-public class CouponCodeTemplateAddDTO implements Serializable {
+public class CouponCodeTemplateAddReqDTO implements Serializable {
 }

promotion-service-project/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/rpc/coupon/dto/CouponCodeTemplateUpdateReqDTO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.mall.promotion.api.dto;
+package cn.iocoder.mall.promotion.api.rpc.coupon.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -10,5 +10,5 @@ import java.io.Serializable;
  */
 @Data
 @Accessors(chain = true)
-public class CouponCodeTemplateUpdateDTO implements Serializable {
+public class CouponCodeTemplateUpdateReqDTO implements Serializable {
 }

promotion-service-project/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/rpc/coupon/dto/CouponTemplateBO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.mall.promotion.api.bo;
+package cn.iocoder.mall.promotion.api.rpc.coupon.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;

promotion-service-project/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/rpc/coupon/dto/CouponTemplatePageBO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.mall.promotion.api.bo;
+package cn.iocoder.mall.promotion.api.rpc.coupon.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;

promotion-service-project/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/rpc/coupon/dto/CouponTemplatePageReqDTO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.mall.promotion.api.dto;
+package cn.iocoder.mall.promotion.api.rpc.coupon.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -11,7 +11,7 @@ import java.io.Serializable;
  */
 @Data
 @Accessors(chain = true)
-public class CouponTemplatePageDTO implements Serializable {
+public class CouponTemplatePageReqDTO implements Serializable {
 
     /**
      * 类型

promotion-service-project/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/rpc/recommend/ProductRecommendService.java

@@ -0,0 +1,24 @@
+package cn.iocoder.mall.promotion.api.rpc.recommend.dto;
+
+import cn.iocoder.common.framework.enums.CommonStatusEnum;
+import cn.iocoder.common.framework.exception.ServiceException;
+import cn.iocoder.common.framework.validator.InEnum;
+
+import java.util.List;
+
+public interface ProductRecommendService {
+
+    List<ProductRecommendRespDTO> getProductRecommendList(Integer type, Integer status);
+
+    ProductRecommendPageRespDTO getProductRecommendPage(ProductRecommendPageReqDTO productRecommendPageDTO);
+
+    ProductRecommendRespDTO addProductRecommend(Integer adminId, ProductRecommendAddReqDTO productRecommendAddDTO) throws ServiceException;
+
+    Boolean updateProductRecommend(Integer adminId, ProductRecommendUpdateReqDTO productRecommendUpdateDTO) throws ServiceException;
+
+    Boolean updateProductRecommendStatus(Integer adminId, Integer productRecommendId,
+                                         @InEnum(value = CommonStatusEnum.class, message = "修改状态必须是 {value}") Integer status) throws ServiceException;
+
+    Boolean deleteProductRecommend(Integer adminId, Integer productRecommendId);
+
+}

promotion-service-project/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/rpc/recommend/dto/ProductRecommendAddReqDTO.java

@@ -1,7 +1,7 @@
-package cn.iocoder.mall.promotion.api.dto;
+package cn.iocoder.mall.promotion.api.rpc.recommend.dto;
 
 import cn.iocoder.common.framework.validator.InEnum;
-import cn.iocoder.mall.promotion.api.constant.ProductRecommendTypeEnum;
+import cn.iocoder.mall.promotion.api.enums.ProductRecommendTypeEnum;
 import lombok.Data;
 import lombok.experimental.Accessors;
 import org.hibernate.validator.constraints.Length;
@@ -14,7 +14,7 @@ import java.io.Serializable;
  */
 @Data
 @Accessors(chain = true)
-public class ProductRecommendAddDTO implements Serializable {
+public class ProductRecommendAddReqDTO implements Serializable {
 
     @InEnum(value = ProductRecommendTypeEnum.class, message = "修改推荐类型必须是 {value}")
     @NotNull(message = "推荐类型不能为空")

promotion-service-project/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/rpc/recommend/dto/ProductRecommendPageReqDTO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.mall.promotion.api.dto;
+package cn.iocoder.mall.promotion.api.rpc.recommend.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -11,7 +11,7 @@ import java.io.Serializable;
  */
 @Data
 @Accessors(chain = true)
-public class ProductRecommendPageDTO implements Serializable {
+public class ProductRecommendPageReqDTO implements Serializable {
 
     /**
      * 推荐类型

promotion-service-project/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/rpc/recommend/dto/ProductRecommendPageRespDTO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.mall.promotion.api.bo;
+package cn.iocoder.mall.promotion.api.rpc.recommend.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -11,12 +11,12 @@ import java.util.List;
  */
 @Data
 @Accessors(chain = true)
-public class ProductRecommendPageBO implements Serializable {
+public class ProductRecommendPageRespDTO implements Serializable {
 
     /**
      * ProductRecommend 数组
      */
-    private List<ProductRecommendBO> list;
+    private List<ProductRecommendRespDTO> list;
     /**
      * 总量
      */

promotion-service-project/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/rpc/recommend/dto/ProductRecommendRespDTO.java

@@ -1,6 +1,6 @@
-package cn.iocoder.mall.promotion.api.bo;
+package cn.iocoder.mall.promotion.api.rpc.recommend.dto;
 
-import cn.iocoder.mall.promotion.api.constant.ProductRecommendTypeEnum;
+import cn.iocoder.mall.promotion.api.enums.ProductRecommendTypeEnum;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -12,7 +12,7 @@ import java.util.Date;
  */
 @Data
 @Accessors(chain = true)
-public class ProductRecommendBO implements Serializable {
+public class ProductRecommendRespDTO implements Serializable {
 
     /**
      * 编号

promotion-service-project/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/rpc/recommend/dto/ProductRecommendUpdateReqDTO.java

@@ -1,7 +1,7 @@
-package cn.iocoder.mall.promotion.api.dto;
+package cn.iocoder.mall.promotion.api.rpc.recommend.dto;
 
 import cn.iocoder.common.framework.validator.InEnum;
-import cn.iocoder.mall.promotion.api.constant.ProductRecommendTypeEnum;
+import cn.iocoder.mall.promotion.api.enums.ProductRecommendTypeEnum;
 import lombok.Data;
 import lombok.experimental.Accessors;
 import org.hibernate.validator.constraints.Length;
@@ -14,7 +14,7 @@ import java.io.Serializable;
  */
 @Data
 @Accessors(chain = true)
-public class ProductRecommendUpdateDTO implements Serializable {
+public class ProductRecommendUpdateReqDTO implements Serializable {
 
     @NotNull(message = "编号不能为空")
     private Integer id;

promotion-service-project/promotion-service-app/pom.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         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">
+    <parent>
+        <artifactId>promotion-service-project</artifactId>
+        <groupId>cn.iocoder.mall</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>promotion-service-app</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>cn.iocoder.mall</groupId>
+            <artifactId>promotion-service-api</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/BannerService.java

@@ -1,28 +0,0 @@
-package cn.iocoder.mall.promotion.api;
-
-import cn.iocoder.common.framework.enums.CommonStatusEnum;
-import cn.iocoder.common.framework.validator.InEnum;
-import cn.iocoder.mall.promotion.api.bo.BannerBO;
-import cn.iocoder.mall.promotion.api.bo.BannerPageBO;
-import cn.iocoder.mall.promotion.api.dto.BannerAddDTO;
-import cn.iocoder.mall.promotion.api.dto.BannerPageDTO;
-import cn.iocoder.mall.promotion.api.dto.BannerUpdateDTO;
-
-import java.util.List;
-
-public interface BannerService {
-
-    List<BannerBO> getBannerListByStatus(Integer status);
-
-    BannerPageBO getBannerPage(BannerPageDTO bannerPageDTO);
-
-    BannerBO addBanner(Integer adminId, BannerAddDTO bannerAddDTO);
-
-    Boolean updateBanner(Integer adminId, BannerUpdateDTO bannerUpdateDTO);
-
-    Boolean updateBannerStatus(Integer adminId, Integer bannerId,
-                               @InEnum(value = CommonStatusEnum.class, message = "修改状态必须是 {value}") Integer status);
-
-    Boolean deleteBanner(Integer adminId, Integer bannerId);
-
-}

promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/ProductRecommendService.java

@@ -1,29 +0,0 @@
-package cn.iocoder.mall.promotion.api;
-
-import cn.iocoder.common.framework.enums.CommonStatusEnum;
-import cn.iocoder.common.framework.exception.ServiceException;
-import cn.iocoder.common.framework.validator.InEnum;
-import cn.iocoder.mall.promotion.api.bo.ProductRecommendBO;
-import cn.iocoder.mall.promotion.api.bo.ProductRecommendPageBO;
-import cn.iocoder.mall.promotion.api.dto.ProductRecommendAddDTO;
-import cn.iocoder.mall.promotion.api.dto.ProductRecommendPageDTO;
-import cn.iocoder.mall.promotion.api.dto.ProductRecommendUpdateDTO;
-
-import java.util.List;
-
-public interface ProductRecommendService {
-
-    List<ProductRecommendBO> getProductRecommendList(Integer type, Integer status);
-
-    ProductRecommendPageBO getProductRecommendPage(ProductRecommendPageDTO productRecommendPageDTO);
-
-    ProductRecommendBO addProductRecommend(Integer adminId, ProductRecommendAddDTO productRecommendAddDTO) throws ServiceException;
-
-    Boolean updateProductRecommend(Integer adminId, ProductRecommendUpdateDTO productRecommendUpdateDTO) throws ServiceException;
-
-    Boolean updateProductRecommendStatus(Integer adminId, Integer productRecommendId,
-                                         @InEnum(value = CommonStatusEnum.class, message = "修改状态必须是 {value}") Integer status) throws ServiceException;
-
-    Boolean deleteProductRecommend(Integer adminId, Integer productRecommendId);
-
-}

promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/PromotionActivityService.java

@@ -1,20 +0,0 @@
-package cn.iocoder.mall.promotion.api;
-
-import cn.iocoder.mall.promotion.api.bo.PromotionActivityBO;
-import cn.iocoder.mall.promotion.api.bo.PromotionActivityPageBO;
-import cn.iocoder.mall.promotion.api.dto.PromotionActivityPageDTO;
-
-import java.util.Collection;
-import java.util.List;
-
-public interface PromotionActivityService {
-
-    List<PromotionActivityBO> getPromotionActivityListBySpuId(Integer spuId,
-                                                                            Collection<Integer> activityStatuses);
-
-    List<PromotionActivityBO> getPromotionActivityListBySpuIds(Collection<Integer> spuIds,
-                                                               Collection<Integer> activityStatuses);
-
-    PromotionActivityPageBO getPromotionActivityPage(PromotionActivityPageDTO promotionActivityPageDTO);
-
-}

promotion/promotion-service-impl/src/main/java/cn/iocoder/mall/promotion/biz/config/ServiceExceptionConfiguration.java

@@ -1,7 +1,7 @@
 package cn.iocoder.mall.promotion.biz.config;
 
 import cn.iocoder.common.framework.util.ServiceExceptionUtil;
-import cn.iocoder.mall.promotion.api.constant.PromotionErrorCodeEnum;
+import cn.iocoder.mall.promotion.api.enums.PromotionErrorCodeEnum;
 import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.event.EventListener;

promotion/promotion-service-impl/src/main/java/cn/iocoder/mall/promotion/biz/dataobject/CouponTemplateDO.java

@@ -38,7 +38,7 @@ public class CouponTemplateDO extends BaseDO {
     /**
      * 优惠码状态
      *
-     * {@link cn.iocoder.mall.promotion.api.constant.CouponTemplateStatusEnum}
+     * {@link cn.iocoder.mall.promotion.api.enums.CouponTemplateStatusEnum}
      *
      * 当优惠劵（码）开启中，可以手动操作，设置禁用中。
      */

promotion/promotion-service-impl/src/main/java/cn/iocoder/mall/promotion/biz/dataobject/ProductRecommendDO.java

@@ -2,7 +2,7 @@ package cn.iocoder.mall.promotion.biz.dataobject;
 
 
 import cn.iocoder.mall.mybatis.core.dataobject.DeletableDO;
-import cn.iocoder.mall.promotion.api.constant.ProductRecommendTypeEnum;
+import cn.iocoder.mall.promotion.api.enums.ProductRecommendTypeEnum;
 import lombok.Data;
 import lombok.experimental.Accessors;
 

promotion/promotion-service-impl/src/main/java/cn/iocoder/mall/promotion/biz/dataobject/PromotionActivityDO.java

@@ -25,7 +25,7 @@ public class PromotionActivityDO extends BaseDO {
     /**
      * 活动类型
      *
-     * 参见 {@link cn.iocoder.mall.promotion.api.constant.PromotionActivityTypeEnum} 枚举
+     * 参见 {@link cn.iocoder.mall.promotion.api.enums.PromotionActivityTypeEnum} 枚举
      */
     private Integer activityType;
 //    /**
@@ -36,7 +36,7 @@ public class PromotionActivityDO extends BaseDO {
     /**
      * 活动状态
      *
-     * 参见 {@link cn.iocoder.mall.promotion.api.constant.PromotionActivityStatusEnum} 枚举
+     * 参见 {@link cn.iocoder.mall.promotion.api.enums.PromotionActivityStatusEnum} 枚举
      */
     private Integer status;
     /**
@@ -165,7 +165,7 @@ public class PromotionActivityDO extends BaseDO {
         /**
          * 可用范围的类型
          *
-         * 参见 {@link cn.iocoder.mall.promotion.api.constant.RangeTypeEnum} 枚举
+         * 参见 {@link cn.iocoder.mall.promotion.api.enums.RangeTypeEnum} 枚举
          * 暂时只用 “所有可用” + “PRODUCT_INCLUDE_PRT”
          */
         private Integer rangeType;

promotion/promotion-service-impl/src/main/java/cn/iocoder/mall/promotion/biz/service/BannerServiceImpl.java

@@ -6,7 +6,7 @@ import cn.iocoder.mall.mybatis.core.enums.DeletedStatusEnum;
 import cn.iocoder.mall.promotion.api.BannerService;
 import cn.iocoder.mall.promotion.api.bo.BannerBO;
 import cn.iocoder.mall.promotion.api.bo.BannerPageBO;
-import cn.iocoder.mall.promotion.api.constant.PromotionErrorCodeEnum;
+import cn.iocoder.mall.promotion.api.enums.PromotionErrorCodeEnum;
 import cn.iocoder.mall.promotion.api.dto.BannerAddDTO;
 import cn.iocoder.mall.promotion.api.dto.BannerPageDTO;
 import cn.iocoder.mall.promotion.api.dto.BannerUpdateDTO;

promotion/promotion-service-impl/src/main/java/cn/iocoder/mall/promotion/biz/service/CouponServiceImpl.java

@@ -6,7 +6,7 @@ import cn.iocoder.common.framework.util.ServiceExceptionUtil;
 import cn.iocoder.common.framework.util.StringUtil;
 import cn.iocoder.mall.promotion.api.CouponService;
 import cn.iocoder.mall.promotion.api.bo.*;
-import cn.iocoder.mall.promotion.api.constant.*;
+import cn.iocoder.mall.promotion.api.enums.*;
 import cn.iocoder.mall.promotion.api.dto.*;
 import cn.iocoder.mall.promotion.biz.convert.CouponCardConvert;
 import cn.iocoder.mall.promotion.biz.convert.CouponTemplateConvert;

promotion/promotion-service-impl/src/main/java/cn/iocoder/mall/promotion/biz/service/ProductRecommendServiceImpl.java

@@ -7,7 +7,7 @@ import cn.iocoder.mall.product.rpc.api.ProductSpuRpc;
 import cn.iocoder.mall.promotion.api.ProductRecommendService;
 import cn.iocoder.mall.promotion.api.bo.ProductRecommendBO;
 import cn.iocoder.mall.promotion.api.bo.ProductRecommendPageBO;
-import cn.iocoder.mall.promotion.api.constant.PromotionErrorCodeEnum;
+import cn.iocoder.mall.promotion.api.enums.PromotionErrorCodeEnum;
 import cn.iocoder.mall.promotion.api.dto.ProductRecommendAddDTO;
 import cn.iocoder.mall.promotion.api.dto.ProductRecommendPageDTO;
 import cn.iocoder.mall.promotion.api.dto.ProductRecommendUpdateDTO;

promotion/promotion-service-impl/src/main/java/cn/iocoder/mall/promotion/biz/service/PromotionActivityServiceImpl.java

@@ -3,8 +3,8 @@ package cn.iocoder.mall.promotion.biz.service;
 import cn.iocoder.mall.promotion.api.PromotionActivityService;
 import cn.iocoder.mall.promotion.api.bo.PromotionActivityBO;
 import cn.iocoder.mall.promotion.api.bo.PromotionActivityPageBO;
-import cn.iocoder.mall.promotion.api.constant.PromotionActivityTypeEnum;
+import cn.iocoder.mall.promotion.api.enums.PromotionActivityTypeEnum;
-import cn.iocoder.mall.promotion.api.constant.RangeTypeEnum;
+import cn.iocoder.mall.promotion.api.enums.RangeTypeEnum;
 import cn.iocoder.mall.promotion.api.dto.PromotionActivityPageDTO;
 import cn.iocoder.mall.promotion.biz.convert.PromotionActivityConvert;
 import cn.iocoder.mall.promotion.biz.dao.PromotionActivityMapper;

promotion/promotion-service-impl/src/test/java/cn/iocoder/mall/promotion/biz/dao/PromotionActivityMapperTest.java

@@ -1,10 +1,10 @@
 package cn.iocoder.mall.promotion.biz.dao;
 
 import cn.iocoder.common.framework.util.DateUtil;
-import cn.iocoder.mall.promotion.api.constant.PreferentialTypeEnum;
+import cn.iocoder.mall.promotion.api.enums.PreferentialTypeEnum;
-import cn.iocoder.mall.promotion.api.constant.PromotionActivityStatusEnum;
+import cn.iocoder.mall.promotion.api.enums.PromotionActivityStatusEnum;
-import cn.iocoder.mall.promotion.api.constant.PromotionActivityTypeEnum;
+import cn.iocoder.mall.promotion.api.enums.PromotionActivityTypeEnum;
-import cn.iocoder.mall.promotion.api.constant.RangeTypeEnum;
+import cn.iocoder.mall.promotion.api.enums.RangeTypeEnum;
 import cn.iocoder.mall.promotion.biz.dataobject.PromotionActivityDO;
 import org.junit.Ignore;
 import org.junit.Test;

promotion/promotion-start/src/main/java/cn/iocoder/mall/promotion/application/controller/admins/AdminsPromotionActivityController.java

@@ -3,7 +3,7 @@ package cn.iocoder.mall.promotion.application.controller.admins;
 import cn.iocoder.common.framework.vo.CommonResult;
 import cn.iocoder.mall.promotion.api.PromotionActivityService;
 import cn.iocoder.mall.promotion.api.bo.PromotionActivityPageBO;
-import cn.iocoder.mall.promotion.api.constant.PromotionActivityStatusEnum;
+import cn.iocoder.mall.promotion.api.enums.PromotionActivityStatusEnum;
 import cn.iocoder.mall.promotion.api.dto.PromotionActivityPageDTO;
 import io.swagger.annotations.Api;
 import org.apache.dubbo.config.annotation.Reference;