9月9消费退款plus

src/main/java/com/example/demo/serviceImpl/coin/RefundServiceImpl.java

@@ -214,15 +214,21 @@ public class RefundServiceImpl implements RefundService {
             String orderCode = record.getOrderCode() != null ? record.getOrderCode() : "无订单号";
             String goodsName = record.getGoodsName() != null ? record.getGoodsName() : "无商品名";
 
+            BigDecimal permanentGold = record.getPermanentGold() != null ? record.getPermanentGold() : BigDecimal.ZERO;
+            BigDecimal freeGold = record.getFreeGold() != null ? record.getFreeGold() : BigDecimal.ZERO;
+            BigDecimal taskGold = record.getTaskGold() != null ? record.getTaskGold() : BigDecimal.ZERO;
+
+// 计算总和
             // 拼接格式：订单号_商品名（例如：XF20250629_商品BC）
             String combined = orderCode + "_" + goodsName;
             RefundUser newRefundUser = new RefundUser();
             newRefundUser.setOrderCode(orderCode);
             newRefundUser.setGoodsName(goodsName);
-            newRefundUser.setSumGold(record.getPermanentGold().add(record.getFreeGold()).add(record.getTaskGold()));
+            newRefundUser.setSumGold(permanentGold.add(freeGold).add(taskGold));
             newRefundUser.setPermanentGold(record.getPermanentGold());
             newRefundUser.setFreeGold(record.getFreeGold());
             newRefundUser.setTaskGold(record.getTaskGold());
+            newRefundUser.setIsRefund(record.getIsRefund());
             list.add(newRefundUser);
         }
         return list;

src/main/resources/mapper/RefundMapper.xml

@@ -266,7 +266,6 @@
         ugr.goods_name AS goodsName,
         ugr.is_refund AS isRefund,
         ugr.order_code AS orderCode,
-        ugr.permanent_gold AS permanentGold,
         (COALESCE(ugr.free_june, 0) + COALESCE(ugr.free_december, 0)) AS freeGold,
         ugr.task_gold AS taskGold
         FROM user_gold_record ugr