促销活动代码迁移

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

@@ -1,7 +1,7 @@
 package cn.iocoder.mall.promotion.api.enums.activity;
 
 /**
- * 推广活动类型枚举
+ * 促销活动类型枚举
  */
 public enum PromotionActivityTypeEnum {
 

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

@@ -1,20 +1,19 @@
 package cn.iocoder.mall.promotion.api.rpc.activity;
 
 import cn.iocoder.common.framework.vo.CommonResult;
+import cn.iocoder.common.framework.vo.PageResult;
 import cn.iocoder.mall.promotion.api.rpc.activity.dto.PromotionActivityListReqDTO;
+import cn.iocoder.mall.promotion.api.rpc.activity.dto.PromotionActivityPageReqDTO;
 import cn.iocoder.mall.promotion.api.rpc.activity.dto.PromotionActivityRespDTO;
 
 import java.util.List;
 
+/**
+ * 促销活动 Rpc 接口
+ */
 public interface PromotionActivityRpc {
 
-//    List<PromotionActivityRespDTO> getPromotionActivityListBySpuId(Integer spuId,
-//                                                                   Collection<Integer> activityStatuses);
-//
-//    List<PromotionActivityRespDTO> getPromotionActivityListBySpuIds(Collection<Integer> spuIds,
-//                                                                    Collection<Integer> activityStatuses);
-//
-//    PromotionActivityPageReqDTO getPromotionActivityPage(PromotionActivityPageRespDTO promotionActivityPageDTO);
+    CommonResult<PageResult<PromotionActivityRespDTO>> pagePromotionActivity(PromotionActivityPageReqDTO pageReqDTO);
 
     CommonResult<List<PromotionActivityRespDTO>> listPromotionActivities(PromotionActivityListReqDTO listReqDTO);
 

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

@@ -1,24 +1,33 @@
 package cn.iocoder.mall.promotion.api.rpc.activity.dto;
 
+import cn.iocoder.common.framework.vo.PageParam;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import java.util.List;
+import java.util.Collection;
 
 /**
- * 促销活动分页 BO
+ * 促销活动分页 Request DTO
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-public class PromotionActivityPageReqDTO {
+public class PromotionActivityPageReqDTO extends PageParam {
 
     /**
-     * PromotionActivityBO 数组
+     * 标题
+     *
+     * 模糊匹配
      */
-    private List<PromotionActivityRespDTO> list;
+    private String title;
     /**
-     * 总量
+     * 活动类型
      */
-    private Integer total;
+    private Integer activityType;
+    /**
+     * 状态
+     */
+    private Collection<Integer> statuses;
 
 }

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

@@ -1,37 +0,0 @@
-package cn.iocoder.mall.promotion.api.rpc.activity.dto;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import javax.validation.constraints.NotNull;
-import java.io.Serializable;
-import java.util.Collection;
-
-/**
- * 商品推荐分页 DTO
- */
-@Data
-@Accessors(chain = true)
-public class PromotionActivityPageRespDTO implements Serializable {
-
-    /**
-     * 标题
-     *
-     * 模糊匹配
-     */
-    private String title;
-    /**
-     * 活动类型
-     */
-    private Integer activityType;
-    /**
-     * 状态
-     */
-    private Collection<Integer> statuses;
-
-    @NotNull(message = "页码不能为空")
-    private Integer pageNo;
-    @NotNull(message = "每页条数不能为空")
-    private Integer pageSize;
-
-}

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

@@ -52,6 +52,10 @@ public class PromotionActivityRespDTO implements Serializable {
      * 满减送
      */
     private FullPrivilege fullPrivilege;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
 
     /**
      * 限时折扣