admin/qingcheng-houduan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

项目明细调整

Browse Source
This commit is contained in:
chen-xin-zhi
2025-05-09 11:20:10 +08:00
parent 093c8332e6
commit a607eff4d8
12 changed files with 86 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/com/greenorange/promotion/model/dto/project/ProjectAddRequest.java
View File

@ -19,18 +19,13 @@ import java.math.BigDecimal;
@Schema(description = "项目添加请求体", requiredProperties = {
"projectName",
"projectImage",
"maxProjectPrice",
"minProjectPrice",
"projectDescription",
"settlementDesc",
"projectDesc",
"projectFlow",
"applyPromoCodeDesc",
"projectSettlementCycle",
"currentPromotionCount",
"maxPromoterCount",
"projectStatus",
"isShelves",
})
public class ProjectAddRequest implements Serializable {
@ -90,33 +85,13 @@ public class ProjectAddRequest implements Serializable {
@Schema(description = "项目结算周期", example = "2")
private Integer projectSettlementCycle;
/**
* 当前推广人数
*/
@Min(value = 1, message = "当前推广人数不能小于1")
@Schema(description = "当前推广人数", example = "150")
private Integer currentPromotionCount;
/**
* 最大推广人数
*/
@Min(value = 1, message = "当前推广人数不能小于1")
@Min(value = 1, message = "最大推广人数不能小于1")
@Schema(description = "最大推广人数", example = "200")
private Integer maxPromoterCount;
/**
* 项目状态（项目运行|人数已满|项目暂停）
*/
@UserEnumValue(enumClass = ProjectStatusEnum.class)
@Schema(description = "项目状态", example = "项目运行")
private String projectStatus;
/**
* 是否上架
*/
@Schema(description = "是否上架", example = "true")
private Boolean isShelves;
@Serial
private static final long serialVersionUID = 1L;

23
src/main/java/com/greenorange/promotion/model/dto/project/ProjectUpdateRequest.java
View File

@ -20,18 +20,13 @@ import java.math.BigDecimal;
"id",
"projectName",
"projectImage",
"maxProjectPrice",
"minProjectPrice",
"projectDescription",
"settlementDesc",
"projectDesc",
"projectFlow",
"applyPromoCodeDesc",
"projectSettlementCycle",
"currentPromotionCount",
"maxPromoterCount",
"projectStatus",
"isShelves",
})
public class ProjectUpdateRequest implements Serializable {
@ -98,30 +93,12 @@ public class ProjectUpdateRequest implements Serializable {
@Schema(description = "项目结算周期", example = "2")
private Integer projectSettlementCycle;
/**
* 当前推广人数
*/
@Schema(description = "当前推广人数", example = "150")
private Integer currentPromotionCount;
/**
* 最大推广人数
*/
@Schema(description = "最大推广人数", example = "200")
private Integer maxPromoterCount;
/**
* 项目状态（项目运行|人数已满|项目暂停）
*/
@NotBlank(message = "项目状态不能为空")
@Schema(description = "项目状态", example = "项目运行")
private String projectStatus;
/**
* 是否上架
*/
@Schema(description = "是否上架", example = "true")
private Boolean isShelves;
@Serial

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

@ -16,6 +16,7 @@ import java.math.BigDecimal;
@Schema(description = "项目明细添加请求体", requiredProperties = {
"projectDetailName",
"projectSettlementPrice",
"projectMinSettlementPrice",
"maxCommissionRate",
"projectId",
})
@ -25,32 +26,32 @@ public class ProjectDetailAddRequest implements Serializable {
* 项目明细名称
*/
@NotBlank(message = "项目明细名称不能为空")
@Schema(description = "项目明细名称", example = "")
@Schema(description = "项目明细名称", example = "2.9元购买30元券包")
private String projectDetailName;
/**
* 项目结算价
*/
@Schema(description = "项目结算价", example = "")
@Schema(description = "项目结算价", example = "0.72")
private BigDecimal projectSettlementPrice;
/**
* 项目最小结算价格
*/
@Schema(description = "项目最小结算价格", example = "${field.example}")
@Schema(description = "项目最小结算价格", example = "0.66")
private BigDecimal projectMinSettlementPrice;
/**
* 最大抽佣比例
*/
@Schema(description = "最大抽佣比例", example = "")
@Schema(description = "最大抽佣比例", example = "2")
private Integer maxCommissionRate;
/**
* 项目ID
*/
@Min(value = 1L, message = "项目ID ID不能小于1")
@Schema(description = "项目ID", example = "")
@Schema(description = "项目ID", example = "1")
private Long projectId;

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

@ -22,39 +22,39 @@ public class ProjectDetailQueryRequest extends PageRequest implements Serializab
* 项目明细ID
*/
@Min(value = 1L, message = "项目明细ID ID不能小于1")
@Schema(description = "项目明细ID", example = "")
@Schema(description = "项目明细ID", example = "1")
private Long id;
/**
* 项目明细名称
*/
@NotBlank(message = "项目明细名称不能为空")
@Schema(description = "项目明细名称", example = "")
@Schema(description = "项目明细名称", example = "2.9元购买30元券包")
private String projectDetailName;
/**
* 项目结算价
*/
@Schema(description = "项目结算价", example = "")
@Schema(description = "项目结算价", example = "0.72")
private BigDecimal projectSettlementPrice;
/**
* 项目最小结算价格
*/
@Schema(description = "项目最小结算价格", example = "${field.example}")
@Schema(description = "项目最小结算价格", example = "0.66")
private BigDecimal projectMinSettlementPrice;
/**
* 最大抽佣比例
*/
@Schema(description = "最大抽佣比例", example = "")
@Schema(description = "最大抽佣比例", example = "2")
private Integer maxCommissionRate;
/**
* 项目ID
*/
@Min(value = 1L, message = "项目ID ID不能小于1")
@Schema(description = "项目ID", example = "")
@Schema(description = "项目ID", example = "1")
private Long projectId;

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

@ -17,6 +17,7 @@ import java.math.BigDecimal;
"id",
"projectDetailName",
"projectSettlementPrice",
"projectMinSettlementPrice",
"maxCommissionRate",
"projectId",
})
@ -26,39 +27,39 @@ public class ProjectDetailUpdateRequest implements Serializable {
* 项目明细ID
*/
@Min(value = 1L, message = "项目明细ID ID不能小于1")
@Schema(description = "项目明细ID", example = "")
@Schema(description = "项目明细ID", example = "1")
private Long id;
/**
* 项目明细名称
*/
@NotBlank(message = "项目明细名称不能为空")
@Schema(description = "项目明细名称", example = "")
@Schema(description = "项目明细名称", example = "2.9元购买30元券包")
private String projectDetailName;
/**
* 项目结算价
*/
@Schema(description = "项目结算价", example = "")
@Schema(description = "项目结算价", example = "0.72")
private BigDecimal projectSettlementPrice;
/**
* 项目最小结算价格
*/
@Schema(description = "项目最小结算价格", example = "${field.example}")
@Schema(description = "项目最小结算价格", example = "0.66")
private BigDecimal projectMinSettlementPrice;
/**
* 最大抽佣比例
*/
@Schema(description = "最大抽佣比例", example = "")
@Schema(description = "最大抽佣比例", example = "2")
private Integer maxCommissionRate;
/**
* 项目ID
*/
@Min(value = 1L, message = "项目ID ID不能小于1")
@Schema(description = "项目ID", example = "")
@Schema(description = "项目ID", example = "1")
private Long projectId;

2
src/main/java/com/greenorange/promotion/model/entity/Project.java
View File

@ -80,7 +80,7 @@ public class Project implements Serializable {
/**
* 是否上架
*/
private Integer isShelves;
private Boolean isShelves;
/**
* 是否删除

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

@ -2,6 +2,7 @@ package com.greenorange.promotion.model.vo.project;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.apache.ibatis.ognl.BooleanExpression;
import java.io.Serial;
import java.io.Serializable;
@ -89,7 +90,7 @@ public class ProjectVO implements Serializable {
/**
* 是否上架
*/
@Schema(description = "是否上架", example = "true")
@Schema(description = "是否上架", example = "1")
private Boolean isShelves;

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

@ -23,33 +23,33 @@ public class ProjectDetailVO implements Serializable {
/**
* 项目明细名称
*/
@Schema(description = "项目明细名称", example = "${field.example}")
@Schema(description = "项目明细名称", example = "2.9元购买30元券包")
private String projectDetailName;
/**
* 项目结算价
*/
@Schema(description = "项目结算价", example = "${field.example}")
@Schema(description = "项目结算价", example = "0.72")
private BigDecimal projectSettlementPrice;
/**
* 项目最小结算价格
*/
@Schema(description = "项目最小结算价格", example = "${field.example}")
@Schema(description = "项目最小结算价格", example = "0.66")
private BigDecimal projectMinSettlementPrice;
/**
* 最大抽佣比例
*/
@Schema(description = "最大抽佣比例", example = "${field.example}")
@Schema(description = "最大抽佣比例", example = "2")
private Integer maxCommissionRate;
/**
* 项目ID
*/
@Schema(description = "项目ID", example = "${field.example}")
@Schema(description = "项目ID", example = "1")
private Long projectId;