From 2b7ec842c2b0fff4b872084e828edd5c3f5dbaf5 Mon Sep 17 00:00:00 2001 From: 陶杰 <1378534974@qq.com> Date: 星期六, 21 九月 2024 22:51:21 +0800 Subject: [PATCH] 1.优惠券-活动优惠券-定时任务-领取时间小于当前时间,自动下架 2.优惠券-优惠券使用记录-定时任务-使用时间小于当前时间,自动过期 3.优惠券-积分优惠券-增加已领取数和未领取数 --- src/main/java/com/mzl/flower/dto/response/point/CustomerPointDetailDTO.java | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/mzl/flower/dto/response/point/CustomerPointDetailDTO.java b/src/main/java/com/mzl/flower/dto/response/point/CustomerPointDetailDTO.java index 84c5568..f95a377 100644 --- a/src/main/java/com/mzl/flower/dto/response/point/CustomerPointDetailDTO.java +++ b/src/main/java/com/mzl/flower/dto/response/point/CustomerPointDetailDTO.java @@ -1,6 +1,7 @@ package com.mzl.flower.dto.response.point; import com.mzl.flower.base.AbstractTransDTO; +import com.mzl.flower.base.annotation.DictTrans; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -8,6 +9,8 @@ @Data public class CustomerPointDetailDTO extends AbstractTransDTO { + + private Long id; @ApiModelProperty("记录日期") private LocalDate recordDate; @@ -18,20 +21,22 @@ @ApiModelProperty("商户ID") private Long customerId; - @ApiModelProperty("积分变更类型-point_change_type") + @ApiModelProperty("积分变更类型-POINT_CHANGE_TYPE") + @DictTrans(target = "changeTypeStr",codeType = "POINT_CHANGE_TYPE") private String changeType; - @ApiModelProperty("积分类型-point_type") + @ApiModelProperty("积分类型-POINT_TYPE") + @DictTrans(target = "typeStr",codeType = "POINT_TYPE") private String type; + + @ApiModelProperty("积分变更类型-point_change_type") + private String changeTypeStr; + + @ApiModelProperty("积分类型-POINT_TYPE") + private String typeStr; @ApiModelProperty("积分") private String point; - - @ApiModelProperty("使用积分") - private String usePoint; - - @ApiModelProperty("过期积分") - private String expiredPoint; @ApiModelProperty("积分备注") private String remarks; -- Gitblit v1.9.3