From df864d1d636751424fd642d3bdd33c53cf63500d Mon Sep 17 00:00:00 2001 From: Administrator <15274802129@163.com> Date: Mon, 07 Jul 2025 17:51:09 +0800 Subject: [PATCH] feat(mall): 为活动订单项添加积分和成长值奖 - 在活动添加和编辑页面增加积分和成长值输入字段 - 更新活动实体类,添加 scoreCnt 和 growthCnt 字段 - 修改活动订单项处理逻辑,增加积分和成长值奖励的计算和发放 - 优化活动订单项状态检查逻辑,移除冗余代码 --- src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderRefundVo.java | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderRefundVo.java b/src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderRefundVo.java index 4464c85..7ea3d44 100644 --- a/src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderRefundVo.java +++ b/src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderRefundVo.java @@ -1,7 +1,11 @@ package cc.mrbird.febs.mall.vo; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; @Data @ApiModel(value = "AdminMallOrderRefundVo", description = "信息返回类") @@ -12,6 +16,8 @@ private String buyName; private String buyPhone; + + private String buyBindPhone; private String addressDetail; @@ -38,4 +44,11 @@ private Integer type; private String expressCom; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createdTime; + + private BigDecimal amount; + + private Integer beforeStatus; } -- Gitblit v1.9.1