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/entity/MallRefundEntity.java | 41 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 41 insertions(+), 0 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallRefundEntity.java b/src/main/java/cc/mrbird/febs/mall/entity/MallRefundEntity.java
index 884b517..dae67f7 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallRefundEntity.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallRefundEntity.java
@@ -1,10 +1,13 @@
package cc.mrbird.febs.mall.entity;
import cc.mrbird.febs.common.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.math.BigDecimal;
+import java.util.Date;
@Data
@TableName("mall_refund")
@@ -16,6 +19,8 @@
private Long memberId;
//退款订单ID
private Long orderId;
+ //退款订单详情ID
+ private Long itemId;
//退款方式 1：微信 2：支付宝 3:其他
private Integer type;
//退款状态 1：成功 2：失败 3:退款中
@@ -23,4 +28,40 @@
//退款金额
private BigDecimal amount;
+ //退款原因
+ private String refundReason;
+ //退款说明
+ private String refundRemark;
+ //退款图片
+ private String refundPic;
+
+ @TableField(exist = false)
+ private String orderNo;
+
+ @TableField(exist = false)
+ private String status;
+
+ @TableField(exist = false)
+ private String goodsName;
+
+ @TableField(exist = false)
+ private Integer cnt;
+
+ @TableField(exist = false)
+ private String[] refundPicList;
+
+ @TableField(exist = false)
+ private String refundMemberName;
+ @TableField(exist = false)
+ private String refundMemberPhone;
+
+ @TableField(exist = false)
+ private String leaderName;
+ @TableField(exist = false)
+ private String leaderPhone;
+
+ @TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date orderTime;
+
}
--
Gitblit v1.9.1