项目明细调整

src/main/java/com/greenorange/promotion/model/dto/projectCommission/ProjectCommissionAddRequest.java

@@ -3,7 +3,10 @@ package com.greenorange.promotion.model.dto.projectCommission;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Min;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -20,6 +23,9 @@ import java.math.BigDecimal;
                 "projectId",
                 "userId",
 })
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
 public class ProjectCommissionAddRequest implements Serializable {
 
     /**

src/main/java/com/greenorange/promotion/model/dto/projectDetail/ProjectDetailAddRequest.java

@@ -45,7 +45,7 @@ public class ProjectDetailAddRequest implements Serializable {
      * 最大抽佣比例
      */
     @Schema(description = "最大抽佣比例", example = "2")
-    private Integer maxCommissionRate;
+    private BigDecimal maxCommissionRate;
 
     /**
      * 项目ID

src/main/java/com/greenorange/promotion/model/dto/projectDetail/ProjectDetailQueryRequest.java

@@ -48,7 +48,7 @@ public class ProjectDetailQueryRequest extends PageRequest implements Serializab
      * 最大抽佣比例
      */
     @Schema(description = "最大抽佣比例", example = "2")
-    private Integer maxCommissionRate;
+    private BigDecimal maxCommissionRate;
 
     /**
      * 项目ID

src/main/java/com/greenorange/promotion/model/dto/projectDetail/ProjectDetailUpdateRequest.java

@@ -53,7 +53,7 @@ public class ProjectDetailUpdateRequest implements Serializable {
      * 最大抽佣比例
      */
     @Schema(description = "最大抽佣比例", example = "2")
-    private Integer maxCommissionRate;
+    private BigDecimal maxCommissionRate;
 
     /**
      * 项目ID

src/main/java/com/greenorange/promotion/model/dto/subUserProjectCommission/SubUserProjectCommissionAddRequest.java

@@ -3,7 +3,10 @@ package com.greenorange.promotion.model.dto.subUserProjectCommission;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Min;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -21,6 +24,9 @@ import java.math.BigDecimal;
                 "projectId",
                 "userId",
 })
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
 public class SubUserProjectCommissionAddRequest implements Serializable {
 
     /**

src/main/java/com/greenorange/promotion/model/entity/ProjectDetail.java

@@ -40,7 +40,7 @@ public class ProjectDetail implements Serializable {
     /**
      * 最大抽佣比例
      */
-    private Integer maxCommissionRate;
+    private BigDecimal maxCommissionRate;
 
     /**
      * 项目ID

src/main/java/com/greenorange/promotion/model/entity/PromoCode.java

@@ -37,7 +37,7 @@ public class PromoCode implements Serializable {
     private Long projectId;
 
     /**
-     * 推广码状态
+     * 推广码状态(true:占用，false:空闲)
      */
     private Boolean promoCodeStatus;
 

src/main/java/com/greenorange/promotion/model/vo/project/ProjectPageVO.java

@@ -0,0 +1,71 @@
+package com.greenorange.promotion.model.vo.project;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+public class ProjectPageVO implements Serializable {
+
+    /**
+     * 项目 ID
+     */
+    @Schema(description = "项目 ID", example = "1")
+    private Long id;
+
+    /**
+     * 项目名称
+     */
+    @Schema(description = "项目名称", example = "美团省钱包")
+    private String projectName;
+
+    /**
+     * 项目价格
+     */
+    @Schema(description = "项目价格", example = "6.88")
+    private BigDecimal projectPrice;
+
+    /**
+     * 当前推广人数
+     */
+    @Schema(description = "当前推广人数", example = "10")
+    private Integer currentPromotionCount;
+
+    /**
+     * 项目图片URL
+     */
+    @Schema(description = "项目图片URL", example = "http://xxx.png")
+    private String projectImage;
+
+    /**
+     * 项目结算周期
+     */
+    @Schema(description = "项目结算周期", example = "2")
+    private Integer projectSettlementCycle;
+
+    /**
+     * 最大推广人数
+     */
+    @Schema(description = "最大推广人数", example = "200")
+    private Integer maxPromoterCount;
+
+    /**
+     * 项目状态[项目运行(running)|人数已满(full)|项目暂停(paused)]
+     */
+    @Schema(description = "项目状态[项目运行(running)|人数已满(full)|项目暂停(paused)]", example = "running")
+    private String projectStatus;
+
+    /**
+     * 是否上架
+     */
+    @Schema(description = "是否上架", example = "true")
+    private Boolean isShelves;
+
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+}

src/main/java/com/greenorange/promotion/model/vo/project/ProjectVO.java

@@ -27,18 +27,30 @@ public class ProjectVO implements Serializable {
     @Schema(description = "项目名称", example = "美团省钱包")
     private String projectName;
 
-    /**
-     * 项目价格
-     */
-    @Schema(description = "项目价格", example = "0.72")
-    private BigDecimal projectPrice;
-
     /**
      * 项目图片URL
      */
     @Schema(description = "项目图片URL", example = "http://xxx.png")
     private String projectImage;
 
+    /**
+     * 项目结算周期
+     */
+    @Schema(description = "项目结算周期", example = "2")
+    private Integer projectSettlementCycle;
+
+    /**
+     * 最大推广人数
+     */
+    @Schema(description = "最大推广人数", example = "200")
+    private Integer maxPromoterCount;
+
+    /**
+     * 项目状态[项目运行(running)|人数已满(full)|项目暂停(paused)]
+     */
+    @Schema(description = "项目状态[项目运行(running)|人数已满(full)|项目暂停(paused)]", example = "running")
+    private String projectStatus;
+
     /**
      * 项目简介
      */
@@ -69,36 +81,6 @@ public class ProjectVO implements Serializable {
     @Schema(description = "申请推广码说明（富文本）", example = "富文本")
     private String applyPromoCodeDesc;
 
-    /**
-     * 项目结算周期
-     */
-    @Schema(description = "项目结算周期", example = "2")
-    private Integer projectSettlementCycle;
-
-    /**
-     * 当前推广人数
-     */
-    @Schema(description = "当前推广人数", example = "150")
-    private Integer currentPromotionCount;
-
-    /**
-     * 最大推广人数
-     */
-    @Schema(description = "最大推广人数", example = "200")
-    private Integer maxPromoterCount;
-
-    /**
-     * 项目状态[项目运行(running)|人数已满(full)|项目暂停(paused)]
-     */
-    @Schema(description = "项目状态[项目运行(running)|人数已满(full)|项目暂停(paused)]", example = "running")
-    private String projectStatus;
-
-    /**
-     * 是否上架
-     */
-    @Schema(description = "是否上架", example = "1")
-    private Boolean isShelves;
-
 
     @Serial
     private static final long serialVersionUID = 1L;

src/main/java/com/greenorange/promotion/model/vo/projectDetail/ProjectDetailVO.java

@@ -44,7 +44,7 @@ public class ProjectDetailVO implements Serializable {
      * 最大抽佣比例
      */
     @Schema(description = "最大抽佣比例", example = "2")
-    private Integer maxCommissionRate;
+    private BigDecimal maxCommissionRate;
 
     /**
      * 项目ID