feature-reward:完善接口逻辑

yudao-module-reward/yudao-module-reward-api/src/main/java/cn/iocoder/yudao/module/reward/enums/ErrorCodeConstants.java

@@ -8,5 +8,14 @@ import cn.iocoder.yudao.framework.common.exception.ErrorCode;
 public interface ErrorCodeConstants {
     ErrorCode REWARD_NOT_EXISTS = new ErrorCode(1010011001, "礼品不存在");
     ErrorCode REWARD_ENDTIME_ERROR = new ErrorCode(1001011002, "礼品结束时间不能早于当前时间");
+    ErrorCode REWARD_STATUS_NOT_ALLOW_DELETE = new ErrorCode(1001011003, "只有未启用可删除");
+    ErrorCode REWARD_STATUS_NOT_ALLOW_ClOSE = new ErrorCode(1001011004, "未启用礼品不可关闭");
+    ErrorCode REWARD_STATUS_CHANGE_ERROR = new ErrorCode(1001011005, "礼品状态操作不符合规则");
+    ErrorCode REWARD_STATUS_NOT_ALLOW_DELAY = new ErrorCode(1001011006, "只允许延期启用状态礼品");
+    ErrorCode REWARD_STATUS_NOT_ALLOW_CREATE = new ErrorCode(1001011007, "创建的礼品状态只能是启用或未启用");
+    ErrorCode REWARD_START_OR_END_TIME_NOT_ALLOW_CREATE = new ErrorCode(1001011008, "活动时间不合法");
+    ErrorCode REWARD_PICK_METHOD_NOT_ALLOW_CREATE = new ErrorCode(1001011009, "领取方式不合法");
+    ErrorCode REWARD_STATUS_NOT_ALLOW_UPDATE = new ErrorCode(1001011010, "礼物状态不允许编辑");
+    ErrorCode REWARD_STATUS_NOT_ALLOW_ENABLE = new ErrorCode(1001011011, "礼物不能启用");
 }
 

yudao-module-reward/yudao-module-reward-api/src/main/java/cn/iocoder/yudao/module/reward/vo/reward/RewardCreateReqVO.java

@@ -15,12 +15,15 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 public class RewardCreateReqVO {
 
     @ApiModelProperty(value = "中文名称")
+    @Size(max = 50, message = "名称长度不能超过50")
     private String titleZh;
 
     @ApiModelProperty(value = "英文名称")
+    @Size(max = 50, message = "名称长度不能超过50")
     private String titleEn;
 
     @ApiModelProperty(value = "法文名称")
+    @Size(max = 50, message = "名称长度不能超过50")
     private String titleFr;
 
     @ApiModelProperty(value = "中文礼品图片")
@@ -34,6 +37,7 @@ public class RewardCreateReqVO {
 
     @ApiModelProperty(value = "兑换所需积分", required = true)
     @NotNull(message = "兑换所需积分不能为空")
+    @Min(value = 0)
     private Integer pointsRequire;
 
     @ApiModelProperty(value = "兑换网点", required = true)
@@ -42,6 +46,7 @@ public class RewardCreateReqVO {
 
     @ApiModelProperty(value = "剩余数量", required = true)
     @NotNull(message = "剩余数量不能为空")
+    @Min(value = 0)
     private Integer quantityRemain;
 
     @ApiModelProperty(value = "活动开始时间")
@@ -58,6 +63,7 @@ public class RewardCreateReqVO {
 
     @ApiModelProperty(value = "允许兑换次数", required = true)
     @NotNull(message = "允许兑换次数不能为空")
+    @Min(value = 0)
     private Integer allowCount;
 
     @ApiModelProperty(value = "中文备注")

yudao-module-reward/yudao-module-reward-api/src/main/java/cn/iocoder/yudao/module/reward/vo/reward/RewardQueryVO.java

@@ -40,7 +40,7 @@ public class RewardQueryVO {
     private Integer status;
 
     @ApiModelProperty(value = "备注（不区分语言）")
-    private Integer remark;
+    private String remark;
 
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     @ApiModelProperty(value = "开始创建时间")

yudao-module-reward/yudao-module-reward-api/src/main/java/cn/iocoder/yudao/module/reward/vo/reward/RewardUpdateReqVO.java

 package cn.iocoder.yudao.module.reward.vo.reward;
 
 import lombok.*;
+
 import java.util.*;
+
 import io.swagger.annotations.*;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import javax.validation.constraints.*;
 
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
 @ApiModel("管理后台 - 礼品更新 Request VO")
 @Data
-@EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
-public class RewardUpdateReqVO extends RewardBaseVO {
+public class RewardUpdateReqVO {
 
     @ApiModelProperty(value = "", required = true)
     @NotNull(message = "不能为空")
     private Long id;
 
+    @ApiModelProperty(value = "中文名称")
+    @Size(max = 50, message = "名称长度不能超过50")
+    private String titleZh;
+
+    @ApiModelProperty(value = "英文名称")
+    @Size(max = 50, message = "名称长度不能超过50")
+    private String titleEn;
+
+    @ApiModelProperty(value = "法文名称")
+    @Size(max = 50, message = "名称长度不能超过50")
+    private String titleFr;
+
+    @ApiModelProperty(value = "中文礼品图片")
+    private String imgZh;
+
+    @ApiModelProperty(value = "英文礼品图片")
+    private String imgEn;
+
+    @ApiModelProperty(value = "法文礼品图片")
+    private String imgFr;
+
+    @ApiModelProperty(value = "兑换所需积分")
+    @Min(value = 0)
+    private Integer pointsRequire;
+
+    @ApiModelProperty(value = "兑换网点")
+    private Integer nodeId;
+
+    @ApiModelProperty(value = "剩余数量")
+    @Min(value = 0)
+    private Integer quantityRemain;
+
+    @ApiModelProperty(value = "活动开始时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Date startTime;
+
+    @ApiModelProperty(value = "活动结束时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Date endTime;
+
+    @ApiModelProperty(value = "领取方式（1上门领取，2包邮到家，3邮寄到付）")
+    private Integer pickMethod;
+
+    @ApiModelProperty(value = "允许兑换次数")
+    @Min(value = 0)
+    private Integer allowCount;
+
+    @ApiModelProperty(value = "中文备注")
+    @Size(max = 500, message = "中文备注长度不能超过500")
+    private String remarkZh;
+
+    @ApiModelProperty(value = "英文备注")
+    @Size(max = 500, message = "英文备注长度不能超过500")
+    private String remarkEn;
+
+    @ApiModelProperty(value = "法文备注")
+    @Size(max = 500, message = "法文备注长度不能超过500")
+    private String remarkFr;
 }

yudao-module-reward/yudao-module-reward-api/src/test/java/GenRewardCodeTest.java

 import cn.hutool.core.lang.UUID;
+import org.apache.commons.lang3.RandomStringUtils;
 
 public class GenRewardCodeTest {
     public static void main(String[] args) {
-        String format = String.format("%012d", 2);
-        String uuid = UUID.randomUUID().toString().replaceAll("-", "");
-        System.out.println(format);
-        System.out.println(uuid);
+        String string = RandomStringUtils.randomAlphanumeric(12).toUpperCase();
+        System.out.println(string);
     }
 }