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/MallOrderRefund.java |   25 ++++++++++++++++++++++++-
 1 files changed, 24 insertions(+), 1 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallOrderRefund.java b/src/main/java/cc/mrbird/febs/mall/entity/MallOrderRefund.java
index 6ee61ac..9c0d1ff 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallOrderRefund.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallOrderRefund.java
@@ -4,6 +4,9 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
+import java.math.BigDecimal;
+import java.util.Date;
+
 /**
  * @author wzy
  * @date 2021-09-23
@@ -23,11 +26,31 @@
     private String remark;
 
     /**
-     * 1-已申请 2-同意退款 3-驳回退款 4-已提交物流信息 5-已退款
+     * 1-已申请 2-同意退款 3-驳回退款 4-已提交物流信息 5-已退款 6-已取消
      */
     private Integer status;
 
     private String expressNo;
 
     private String expressCom;
+
+    /**
+     * 1-仅退款不退货 2-退款退货
+     */
+    private Integer type;
+
+    /**
+     * 退款前订单状态
+     */
+    private Integer beforeStatus;
+
+    private Date refundTime;
+
+    private String name;
+
+    private String phone;
+
+    private String address;
+
+    private BigDecimal amount;
 }

--
Gitblit v1.9.1