From ac70afa4e394626dc03d82def3df1db886bb7c2e Mon Sep 17 00:00:00 2001 From: 陶杰 <1378534974@qq.com> Date: 星期四, 12 九月 2024 14:43:59 +0800 Subject: [PATCH] 1.活动优惠券-管理端-类型是首页领取的活动优惠券,发布的时候将已经发布的设置为下架,只能留有一个已发布的优惠券 3.活动优惠券-小程序-新增首页弹窗优惠券-如果领取数量没有超过当前优惠券还可以再次领取,超过领取优惠券的话则不返回数据 --- src/main/java/com/mzl/flower/dto/response/point/CustomerPointDetailDTO.java | 19 +++++++++++-------- 1 files changed, 11 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..1ab3855 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; @@ -18,20 +19,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