Merge branch 'refs/heads/feature_member_score_zhangfeng' into feature_member_score

# Conflicts:
#	yudao-module-reward/yudao-module-reward-api/src/main/java/cn/iocoder/yudao/module/reward/enums/ErrorCodeConstants.java
#	yudao-module-reward/yudao-module-reward-api/src/test/java/GenRewardCodeTest.java
#	yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/controller/admin/reward/RewardController.java

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

+package cn.iocoder.yudao.module.reward.api.reward;
+
+import cn.iocoder.yudao.module.reward.api.reward.dto.RedeemRewardReqVO;
+import cn.iocoder.yudao.module.reward.api.reward.dto.RedeemRewardRespDTO;
+
+import java.util.List;
+
+/**
+ * 礼品兑换 api 接口
+ */
+public interface RedeemRewardApi {
+
+    RedeemRewardRespDTO redeemReward(RedeemRewardReqVO redeemRewardReqVO);
+
+    List<RedeemRewardRespDTO> redeemRewards(List<RedeemRewardReqVO> redeemRewardReqVOList);
+}

yudao-module-reward/yudao-module-reward-api/src/main/java/cn/iocoder/yudao/module/reward/api/reward/dto/RedeemRewardReqVO.java

+package cn.iocoder.yudao.module.reward.api.reward.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Data
+@ApiModel("管理后台 - 礼品兑换 Request VO")
+public class RedeemRewardReqVO {
+    @ApiModelProperty(value = "会员名称")
+    private String memberName;
+
+    @ApiModelProperty(value = "当前积分")
+    private Integer score;
+
+    @ApiModelProperty(value = "礼品id")
+    private Long rewardId;
+
+    @ApiModelProperty(value = "兑换数量")
+    private Integer count;
+
+    @ApiModelProperty(value = "兑换方式，同领取方式（1上门领取，2包邮到家，3邮寄到付）")
+    private Integer pickMethod;
+
+    @ApiModelProperty(value = "兑换入口（后台，app，web）")
+    private String entrance;
+
+    @ApiModelProperty(value = "费用数字（两位小数）")
+    private Integer expenses;
+
+    @ApiModelProperty(value = "费用币种（字典配置）")
+    private Integer currency;
+
+    @ApiModelProperty(value = "收件人姓名")
+    private String recipientName;
+
+    @ApiModelProperty(value = "收件人电话")
+    private String recipientPhoneNum;
+
+    @ApiModelProperty(value = "收件人地址")
+    private String recipientAddress;
+
+    @ApiModelProperty(value = "兑换人")
+    private String redeemer;
+
+    @ApiModelProperty(value = "兑换时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Date redemptionTime;
+
+    @ApiModelProperty(value = "快递公司")
+    private String courierCompany;
+
+    @ApiModelProperty(value = "快递单号")
+    private String expressNo;
+
+    @ApiModelProperty(value = "快递日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Date expressDate;
+
+    @ApiModelProperty(value = "快递寄出人")
+    private String expressSender;
+
+    @ApiModelProperty(value = "上传附件")
+    private String annex;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+}

yudao-module-reward/yudao-module-reward-api/src/main/java/cn/iocoder/yudao/module/reward/api/reward/dto/RedeemRewardRespDTO.java

+package cn.iocoder.yudao.module.reward.api.reward.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("管理后台 - 礼品兑换 Response VO")
+public class RedeemRewardRespDTO {
+    @ApiModelProperty(value = "兑换操作结果")
+    private Boolean exchangeResult;
+
+    @ApiModelProperty(value = "兑换操作详情")
+    private String msg;
+}

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

@@ -6,6 +6,16 @@ import cn.iocoder.yudao.framework.common.exception.ErrorCode;
 // TODO 待办：请将下面的错误码复制到 yudao-module-reward-api 模块的 ErrorCodeConstants 类中。注意，请给“TODO 补充编号”设置一个错误码编号！！！
 // ========== 礼品 TODO 补充编号 ==========
 public interface ErrorCodeConstants {
-    ErrorCode _NOT_EXISTS = new ErrorCode(1009011000, "礼品不存在");
+    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/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);
     }
 }

yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/api/reward/RedeemRewardApiImpl.java

+package cn.iocoder.yudao.module.reward.api.reward;
+
+import cn.iocoder.yudao.module.reward.api.reward.dto.RedeemRewardReqVO;
+import cn.iocoder.yudao.module.reward.api.reward.dto.RedeemRewardRespDTO;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import java.util.List;
+
+@Service
+@Validated
+public class RedeemRewardApiImpl implements RedeemRewardApi {
+
+    @Override
+    public RedeemRewardRespDTO redeemReward(RedeemRewardReqVO redeemRewardReqVO) {
+        return null;
+    }
+
+    @Override
+    public List<RedeemRewardRespDTO> redeemRewards(List<RedeemRewardReqVO> redeemRewardReqVOList) {
+        return null;
+    }
+}

yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/controller/admin/reward/RedeemRewardController.java

+package cn.iocoder.yudao.module.reward.controller.admin.reward;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.module.reward.api.reward.RedeemRewardApi;
+import cn.iocoder.yudao.module.reward.api.reward.dto.RedeemRewardReqVO;
+import cn.iocoder.yudao.module.reward.api.reward.dto.RedeemRewardRespDTO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@Validated
+@RestController
+@Api(tags = "管理后台 - 礼品管理")
+@RequestMapping("/reward/redeem")
+public class RedeemRewardController {
+
+    @Resource
+    private RedeemRewardApi redeemRewardApi;
+
+    @PostMapping("/single")
+    @ApiOperation("兑换礼品")
+    //@PreAuthorize("@ss.hasPermission('reward::redeem')")
+    public CommonResult<RedeemRewardRespDTO> redeemReward(@Valid @RequestBody RedeemRewardReqVO redeemRewardReqVO) {
+        return success(redeemRewardApi.redeemReward(redeemRewardReqVO));
+    }
+
+    @PostMapping("/batch")
+    @ApiOperation("批量兑换礼品")
+    //@PreAuthorize("@ss.hasPermission('reward::redeem')")
+    public CommonResult<List<RedeemRewardRespDTO>> redeemRewards(@Valid @RequestBody List<RedeemRewardReqVO> redeemRewardReqVOList) {
+        return success(redeemRewardApi.redeemRewards(redeemRewardReqVOList));
+    }
+}

yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/controller/admin/reward/RewardController.java

@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.List;
@@ -63,7 +64,7 @@ public class RewardController {
     @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class)
     //@PreAuthorize("@ss.hasPermission('reward::query')")
     public CommonResult<RewardBackVO> get(@RequestParam("id") Long id) {
-        RewardDO rewardDO  = rewardService.get(id);
+        RewardDO rewardDO = rewardService.get(id);
         return success(RewardConvert.INSTANCE.convert(rewardDO));
     }
 
@@ -88,7 +89,20 @@ public class RewardController {
     @ApiOperation("礼品状态变更")
     //@PreAuthorize("@ss.hasPermission('reward::query')")
     public CommonResult<Boolean> updateStatus(@Valid @RequestBody RewardStatusReqVO statusVO) {
-        rewardService.updateById(RewardConvert.INSTANCE.convertStatusReqVO(statusVO));
+        rewardService.updateStatus(statusVO);
+        return success(true);
+    }
+
+    @PostMapping("/copy/{id}")
+    @ApiOperation("复制礼品")
+    public CommonResult<Long> copyReward(@NotNull @PathVariable Long id) {
+        return success(rewardService.copyReward(id));
+    }
+
+    @PostMapping("/delay")
+    @ApiOperation("礼品延期")
+    public CommonResult<Boolean> delayReward(@Valid @RequestBody RewardDelayReqVO delayVO) {
+        rewardService.delayReward(delayVO);
         return success(true);
     }
 
@@ -97,7 +111,7 @@ public class RewardController {
     //@PreAuthorize("@ss.hasPermission('reward::export')")
     @OperateLog(type = EXPORT)
     public void exportExcel(@Valid RewardQueryVO query,
-              HttpServletResponse response) throws IOException {
+                            HttpServletResponse response) throws IOException {
         List<RewardDO> list = rewardService.getList(query);
         // 导出 Excel
         List<RewardBackVO> datas = RewardConvert.INSTANCE.convertList(list);

yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/convert/reward/RewardConvert.java

+package cn.iocoder.yudao.module.reward.convert.reward;
+
+import java.util.*;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+import cn.iocoder.yudao.module.reward.vo.reward.*;
+import cn.iocoder.yudao.module.reward.dal.dataobject.reward.RewardDO;
+
+/**
+ * 礼品 Convert
+ * @author 系统管理员
+ */
+@Mapper
+public interface RewardConvert {
+    /*****转换MapStruct*****/
+    RewardConvert INSTANCE = Mappers.getMapper(RewardConvert.class);
+
+    /***
+     * 创建VO转实体
+     * @param bean
+     * @return
+     */
+    RewardDO convert(RewardCreateReqVO bean);
+
+    /***
+     * 修改VO转实体
+     * @param bean
+     * @return
+     */
+    RewardDO convert(RewardUpdateReqVO bean);
+
+    /***
+     * 实体转返回VO
+     * @param bean
+     * @return
+    */
+    RewardBackVO convert(RewardDO bean);
+
+    /***
+     * 实体列表转返回VO列表
+     * @param list
+     * @return
+     */
+    List<RewardBackVO> convertList(List<RewardDO> list);
+
+    /***
+     * 实体分页转返回分页
+     * @param page
+     * @return
+     */
+    PageResult<RewardBackVO> convertPage(PageResult<RewardDO> page);
+
+    /***
+     * 更新礼品状态VO转实体
+     * @param bean
+     * @return
+     */
+    RewardDO convertStatusReqVO(RewardStatusReqVO bean);
+
+    /***
+     * 礼品延期VO转实体
+     * @param bean
+     * @return
+     */
+    RewardDO convertDelayReqVO(RewardDelayReqVO bean);
+}

yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/dal/dataobject/reward/RewardDO.java

+package cn.iocoder.yudao.module.reward.dal.dataobject.reward;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+import java.util.Date;
+
+/**
+ * 礼品 DO
+ *
+ * @author 系统管理员
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("ecw_reward")
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class RewardDO extends BaseDO {
+
+    /**
+     * 主键
+     */
+    @TableId
+    private Long id;
+    /**
+     * 礼品ID
+     */
+    private String code;
+    /**
+     * 中文名称
+     */
+    private String titleZh;
+    /**
+     * 英文名称
+     */
+    private String titleEn;
+    /**
+     * 法文名称
+     */
+    private String titleFr;
+    /**
+     * 中文礼品图片
+     */
+    private String imgZh;
+    /**
+     * 英文礼品图片
+     */
+    private String imgEn;
+    /**
+     * 法文礼品图片
+     */
+    private String imgFr;
+    /**
+     * 兑换所需积分
+     */
+    private Integer pointsRequire;
+    /**
+     * 兑换网点
+     */
+    private Integer nodeId;
+    /**
+     * 已兑换次数
+     */
+    private Integer exchangeCount;
+    /**
+     * 剩余数量
+     */
+    private Integer quantityRemain;
+    /**
+     * 活动开始时间
+     */
+    private Date startTime;
+    /**
+     * 活动结束时间
+     */
+    private Date endTime;
+    /**
+     * 领取方式（1上门领取，2包邮到家，3邮寄到付）
+     */
+    private Integer pickMethod;
+    /**
+     * 允许兑换次数
+     */
+    private Integer allowCount;
+    /**
+     * 中文备注
+     */
+    private String remarkZh;
+    /**
+     * 英文备注
+     */
+    private String remarkEn;
+    /**
+     * 法文备注
+     */
+    private String remarkFr;
+    /**
+     * 礼品状态（1已启用，2未启用，3已关闭，4已过期）
+     */
+    private Integer status;
+
+}

yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/dal/mysql/reward/RewardMapper.java

+package cn.iocoder.yudao.module.reward.dal.mysql.reward;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.AbstractMapper;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQuery;
+import cn.iocoder.yudao.framework.mybatis.core.vo.PageVO;
+import cn.iocoder.yudao.module.reward.dal.dataobject.reward.RewardDO;
+import cn.iocoder.yudao.module.reward.vo.reward.RewardQueryVO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 礼品 Mapper
+ * @author 系统管理员
+ */
+@Mapper
+public interface RewardMapper extends AbstractMapper<RewardDO> {
+    @Override
+    default PageResult<RewardDO> selectPage(PageVO page, Object object) {
+        if (object instanceof RewardQueryVO) {
+            RewardQueryVO vo = (RewardQueryVO)object;
+            return selectPage(page, new LambdaQuery<RewardDO>()
+                .eqIfPresent(RewardDO::getCode, vo.getCode())
+                .eqIfPresent(RewardDO::getTitleZh, vo.getTitle())
+                .eqIfPresent(RewardDO::getTitleEn, vo.getTitle())
+                .eqIfPresent(RewardDO::getTitleFr, vo.getTitle())
+                .eqIfPresent(RewardDO::getPointsRequire, vo.getPointsRequire())
+                .eqIfPresent(RewardDO::getNodeId, vo.getNodeId())
+                .eqIfPresent(RewardDO::getQuantityRemain, vo.getQuantityRemain())
+                .eqIfPresent(RewardDO::getPickMethod, vo.getPickMethod())
+                .eqIfPresent(RewardDO::getStatus, vo.getStatus())
+                .betweenIfPresent(RewardDO::getCreateTime, vo.getBeginCreateTime(), vo.getEndCreateTime())
+                    .orderByDesc(RewardDO::getId));
+        }
+
+        return null;
+    }
+
+    @Override
+    default List<RewardDO> selectList(Object object) {
+        if (object instanceof RewardQueryVO) {
+            RewardQueryVO vo = (RewardQueryVO)object;
+            return selectList(new LambdaQuery<RewardDO>()
+                .eqIfPresent(RewardDO::getCode, vo.getCode())
+                .eqIfPresent(RewardDO::getTitleZh, vo.getTitle())
+                .eqIfPresent(RewardDO::getTitleEn, vo.getTitle())
+                .eqIfPresent(RewardDO::getTitleFr, vo.getTitle())
+                .eqIfPresent(RewardDO::getPointsRequire, vo.getPointsRequire())
+                .eqIfPresent(RewardDO::getNodeId, vo.getNodeId())
+                .eqIfPresent(RewardDO::getQuantityRemain, vo.getQuantityRemain())
+                .eqIfPresent(RewardDO::getPickMethod, vo.getPickMethod())
+                .eqIfPresent(RewardDO::getStatus, vo.getStatus())
+                .betweenIfPresent(RewardDO::getCreateTime, vo.getBeginCreateTime(), vo.getEndCreateTime())
+                    .orderByDesc(RewardDO::getId));
+        }
+
+        return null;
+    }
+}

yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/service/reward/RewardService.java

+package cn.iocoder.yudao.module.reward.service.reward;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.service.IService;
+import cn.iocoder.yudao.framework.mybatis.core.vo.PageVO;
+import cn.iocoder.yudao.module.reward.dal.dataobject.reward.RewardDO;
+import cn.iocoder.yudao.module.reward.vo.reward.*;
+
+import javax.validation.Valid;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 礼品 Service 接口
+ *
+ * @author 系统管理员
+ */
+public interface RewardService extends IService<RewardDO> {
+
+    /**
+     * 创建礼品
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long create(@Valid RewardCreateReqVO createReqVO);
+
+    /**
+     * 更新礼品
+     * @param updateReqVO 更新信息
+     */
+    void update(@Valid RewardUpdateReqVO updateReqVO);
+
+    /**
+     * 删除礼品
+     * @param id 编号
+     */
+    void delete(Long id);
+
+    /**
+     * 获得礼品
+     * @param id 编号
+     * @return 礼品
+     */
+    RewardDO get(Long id);
+
+    /**
+     * 获得礼品列表
+     * @param ids 编号
+     * @return 礼品列表
+     */
+    List<RewardDO> getList(Collection<Long> ids);
+
+    /**
+     * 获得礼品分页
+     * @param page 分页查询
+     * @param query 查询
+     * @return 礼品分页
+     */
+    PageResult<RewardDO> getPage(RewardQueryVO query, PageVO page);
+
+    /**
+     * 获得礼品列表, 用于 Excel 导出
+     * @param query 查询
+     * @return 礼品列表
+     */
+    List<RewardDO> getList(RewardQueryVO query);
+
+    /**
+     * 复制礼品
+     * @param id 编号
+     * @return 新的礼品id
+     */
+    Long copyReward(Long id);
+
+    void delayReward(RewardDelayReqVO delayVO);
+
+    void updateStatus(RewardStatusReqVO statusVO);
+}

yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/vo/reward/RewardBackVO.java

+package cn.iocoder.yudao.module.reward.vo.reward;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+/**
+* 礼品 Response VO
+* @author 系统管理员
+*/
+@Data
+@ApiModel("管理后台 - 礼品 Response VO")
+public class RewardBackVO {
+
+    @ExcelProperty("")
+    @ApiModelProperty(value = "", required = true)
+    private Long id;
+
+    @ExcelProperty("礼品ID")
+    @ApiModelProperty(value = "礼品ID", required = true)
+    private String code;
+
+    @ExcelProperty("中文名称")
+    @ApiModelProperty(value = "中文名称")
+    private String titleZh;
+
+    @ExcelProperty("英文名称")
+    @ApiModelProperty(value = "英文名称")
+    private String titleEn;
+
+    @ExcelProperty("法文名称")
+    @ApiModelProperty(value = "法文名称")
+    private String titleFr;
+
+    @ExcelProperty("中文礼品图片")
+    @ApiModelProperty(value = "中文礼品图片")
+    private String imgZh;
+
+    @ExcelProperty("英文礼品图片")
+    @ApiModelProperty(value = "英文礼品图片")
+    private String imgEn;
+
+    @ExcelProperty("法文礼品图片")
+    @ApiModelProperty(value = "法文礼品图片")
+    private String imgFr;
+
+    @ExcelProperty("兑换所需积分")
+    @ApiModelProperty(value = "兑换所需积分", required = true)
+    private Integer pointsRequire;
+
+    @ExcelProperty("兑换网点")
+    @ApiModelProperty(value = "兑换网点", required = true)
+    private Integer nodeId;
+
+    @ExcelProperty("已兑换次数")
+    @ApiModelProperty(value = "已兑换次数")
+    private Integer exchangeCount;
+
+    @ExcelProperty("剩余数量")
+    @ApiModelProperty(value = "剩余数量", required = true)
+    private Integer quantityRemain;
+
+    @ExcelProperty("活动开始时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @ApiModelProperty(value = "活动开始时间")
+    private Date startTime;
+
+    @ExcelProperty("活动结束时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @ApiModelProperty(value = "活动结束时间")
+    private Date endTime;
+
+    @ExcelProperty("领取方式（1上门领取，2包邮到家，3邮寄到付）")
+    @ApiModelProperty(value = "领取方式（1上门领取，2包邮到家，3邮寄到付）", required = true)
+    private Integer pickMethod;
+
+    @ExcelProperty("允许兑换次数")
+    @ApiModelProperty(value = "允许兑换次数", required = true)
+    private Integer allowCount;
+
+    @ExcelProperty("中文备注")
+    @ApiModelProperty(value = "中文备注")
+    private String remarkZh;
+
+    @ExcelProperty("英文备注")
+    @ApiModelProperty(value = "英文备注")
+    private String remarkEn;
+
+    @ExcelProperty("法文备注")
+    @ApiModelProperty(value = "法文备注")
+    private String remarkFr;
+
+    @ExcelProperty("礼品状态（1已启用，2未启用，3已关闭，4已过期）")
+    @ApiModelProperty(value = "礼品状态（1已启用，2未启用，3已关闭，4已过期）", required = true)
+    private Integer status;
+
+    @ExcelProperty("创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @ApiModelProperty(value = "创建时间", required = true)
+    private Date createTime;
+
+}

yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/vo/reward/RewardBaseVO.java

+package cn.iocoder.yudao.module.reward.vo.reward;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+/**
+* 礼品 Base VO，提供给添加、修改、详细的子 VO 使用
+* 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
+*/
+@Data
+public class RewardBaseVO {
+
+    @ApiModelProperty(value = "礼品ID")
+    private String code;
+
+    @ApiModelProperty(value = "中文名称")
+    private String titleZh;
+
+    @ApiModelProperty(value = "英文名称")
+    private String titleEn;
+
+    @ApiModelProperty(value = "法文名称")
+    private String titleFr;
+
+    @ApiModelProperty(value = "中文礼品图片")
+    private String imgZh;
+
+    @ApiModelProperty(value = "英文礼品图片")
+    private String imgEn;
+
+    @ApiModelProperty(value = "法文礼品图片")
+    private String imgFr;
+
+    @ApiModelProperty(value = "兑换所需积分")
+    private Integer pointsRequire;
+
+    @ApiModelProperty(value = "兑换网点")
+    private Integer nodeId;
+
+    @ApiModelProperty(value = "已兑换次数")
+    private Integer exchangeCount;
+
+    @ApiModelProperty(value = "剩余数量")
+    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 = "允许兑换次数")
+    private Integer allowCount;
+
+    @ApiModelProperty(value = "中文备注")
+    private String remarkZh;
+
+    @ApiModelProperty(value = "英文备注")
+    private String remarkEn;
+
+    @ApiModelProperty(value = "法文备注")
+    private String remarkFr;
+
+    @ApiModelProperty(value = "礼品状态（1已启用，2未启用，3已关闭，4已过期）")
+    private Integer status;
+
+}

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

+package cn.iocoder.yudao.module.reward.vo.reward;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import java.util.Date;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Data
+@ToString(callSuper = true)
+@ApiModel("管理后台 - 礼品创建 Request VO")
+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 = "中文礼品图片")
+    private String imgZh;
+
+    @ApiModelProperty(value = "英文礼品图片")
+    private String imgEn;
+
+    @ApiModelProperty(value = "法文礼品图片")
+    private String imgFr;
+
+    @ApiModelProperty(value = "兑换所需积分", required = true)
+    @NotNull(message = "兑换所需积分不能为空")
+    @Min(value = 0)
+    private Integer pointsRequire;
+
+    @ApiModelProperty(value = "兑换网点", required = true)
+    @NotNull(message = "兑换网点不能为空")
+    private Integer nodeId;
+
+    @ApiModelProperty(value = "剩余数量", required = true)
+    @NotNull(message = "剩余数量不能为空")
+    @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邮寄到付）", required = true)
+    @NotNull(message = "领取方式不能为空")
+    private Integer pickMethod;
+
+    @ApiModelProperty(value = "允许兑换次数", required = true)
+    @NotNull(message = "允许兑换次数不能为空")
+    @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;
+
+    @ApiModelProperty(value = "礼品状态（1已启用，2未启用，3已关闭，4已过期）", required = true)
+    @NotNull(message = "礼品状态不能为空")
+    private Integer status;
+}

yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/vo/reward/RewardDelayReqVO.java

+package cn.iocoder.yudao.module.reward.vo.reward;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Data
+@ApiModel("管理后台 - 礼品延期 VO")
+public class RewardDelayReqVO {
+    @ApiModelProperty(value = "", required = true)
+    @NotNull(message = "不能为空")
+    private Long id;
+
+    @ApiModelProperty(value = "活动结束时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @NotNull(message = "结束时间不能为空")
+    private Date endTime;
+}

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

+package cn.iocoder.yudao.module.reward.vo.reward;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Data
+@ApiModel("管理后台 - 礼品查询 VO")
+public class RewardQueryVO {
+
+    @ApiModelProperty(value = "礼品ID")
+    private String code;
+
+    @ApiModelProperty(value = "名称（不区分语言）")
+    private String title;
+
+    @ApiModelProperty(value = "兑换所需积分")
+    private Integer pointsRequire;
+
+    @ApiModelProperty(value = "兑换所需积分查询条件（1大于，2等于，3小于）")
+    private Integer pointsRequireSymbol;
+
+    @ApiModelProperty(value = "兑换网点")
+    private Integer nodeId;
+
+    @ApiModelProperty(value = "剩余数量")
+    private Integer quantityRemain;
+
+    @ApiModelProperty(value = "剩余数量查询条件（1大于，2等于，3小于）")
+    private Integer quantityRemainSymbol;
+
+    @ApiModelProperty(value = "领取方式（1上门领取，2包邮到家，3邮寄到付）")
+    private Integer pickMethod;
+
+    @ApiModelProperty(value = "礼品状态（1已启用，2未启用，3已关闭，4已过期）")
+    private Integer status;
+
+    @ApiModelProperty(value = "备注（不区分语言）")
+    private String remark;
+
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @ApiModelProperty(value = "开始创建时间")
+    private Date beginCreateTime;
+
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @ApiModelProperty(value = "结束创建时间")
+    private Date endCreateTime;
+
+}

yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/vo/reward/RewardStatusReqVO.java

+package cn.iocoder.yudao.module.reward.vo.reward;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ApiModel("管理后台 - 礼品状态更新 VO")
+public class RewardStatusReqVO {
+    @ApiModelProperty(value = "", required = true)
+    @NotNull(message = "不能为空")
+    private Long id;
+
+    @ApiModelProperty(value = "礼品状态（1已启用，2未启用，3已关闭，4已过期）")
+    @NotNull(message = "礼品状态不能为空")
+    private Integer status;
+}

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

+package cn.iocoder.yudao.module.reward.vo.reward;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import java.util.Date;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@ApiModel("管理后台 - 礼品更新 Request VO")
+@Data
+@ToString(callSuper = true)
+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;
+}