Merge remote-tracking branch 'refs/remotes/origin/lijianlin/feature-20260113-现金管理0109' into milestone-20260113-现金管理0109

src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java

@@ -41,6 +41,12 @@ public class ConsumeUser implements Serializable {
     private BigDecimal freeGold; // 免费金币
     private BigDecimal taskGold; // 任务金币
     private String remark; // 备注
+    // 退款订单相关字段
+    private BigDecimal refundSumGold;// 退款金币总数
+    private BigDecimal refundPermanentGold;// 退款永久金币
+    private BigDecimal refundFreeGold;// 退款免费金币
+    private BigDecimal refundTaskGold;// 退款任务金币
+    private String refundModel;// 退款类型  0全部退款 1部分退款
     @ExcelIgnore
     private Integer adminId; //提交人Id
     private String adminName; //提交人姓名
@@ -56,8 +62,7 @@ public class ConsumeUser implements Serializable {
     private Date endTime; // 结束时间
     @ExcelIgnore
     private String refundType; // 退款类型
-    @ExcelIgnore
-    private String refundModel; // 退款模型
+
     @ExcelIgnore
     private String sortField; //排序字段
     @ExcelIgnore

src/main/java/com/example/demo/serviceImpl/Temporary/RedServiceImpl.java

@@ -382,7 +382,7 @@ public class RedServiceImpl implements RedService {
         userGoldRecord.setTaskGold(-consumeUser.getTaskGold().intValue());
         userGoldRecord.setRemark(consumeUser.getRemark());
         userGoldRecord.setType((byte) 1);
-        userGoldRecord.setIsRefund((byte) 1);
+        userGoldRecord.setIsRefund((byte) 0);
         userGoldRecord.setPayPlatform("金币系统");
         userGoldRecord.setAdminId(consumeUser.getAdminId());
         userGoldRecord.setAuditStatus(1);

src/main/resources/mapper/ConsumeMapper.xml

@@ -87,13 +87,24 @@
         ugr.remark AS remark,
         a.admin_name AS adminName,
         ugr.create_time AS createTime,
-        ugr.is_refund AS isRefund
+        ugr.is_refund AS isRefund,
+        -- 关联退款订单信息
+        ugr1.sum_gold/100 AS refundSumGold,
+        ugr1.permanent_gold/100 AS refundPermanentGold,
+        (COALESCE(ugr1.free_june, 0) + COALESCE(ugr1.free_december, 0))/100 AS refundFreeGold,
+        ugr1.task_gold/100 AS refundTaskGold,
+        ugr1.refund_model AS refundModel
         FROM user_gold_record ugr
         left JOIN
         user u ON u.jwcode = ugr.jwcode
         left JOIN
         admin a ON ugr.admin_id = a.id
         left join market m ON u.market = m.id
+        -- 关联退款订单
+        left JOIN user_gold_record ugr1 ON (
+        ugr.is_refund = 1
+        AND ugr1.order_code = CONCAT('TK_', ugr.order_code)
+        )
 
         <where>
             ugr.type = 1 AND ugr.flag = 1
@@ -109,6 +120,9 @@
             <if test="jwcode != null and jwcode != ''">
                 AND ugr.jwcode = #{jwcode}
             </if>
+            <if test="isRefund != null ">
+                AND ugr.is_refund = #{isRefund}
+            </if>
             <if test="goodsName != null and goodsName != ''">
                 AND ugr.goods_name = #{goodsName}
             </if>