From 8dbaf9317bd5e16ca8d7dadc06030844af3639d1 Mon Sep 17 00:00:00 2001 From: sunjiabei Date: Tue, 9 Sep 2025 15:45:59 +0800 Subject: [PATCH] =?UTF-8?q?9=E6=9C=889=E6=B6=88=E8=B4=B9=E9=80=80=E6=AC=BE?= =?UTF-8?q?plus?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/example/demo/serviceImpl/coin/RefundServiceImpl.java | 8 +++++++- src/main/resources/mapper/RefundMapper.xml | 1 - 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/example/demo/serviceImpl/coin/RefundServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/RefundServiceImpl.java index 1d13b53..53404bd 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/RefundServiceImpl.java +++ b/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; diff --git a/src/main/resources/mapper/RefundMapper.xml b/src/main/resources/mapper/RefundMapper.xml index 1ac9aae..3fcb5d8 100644 --- a/src/main/resources/mapper/RefundMapper.xml +++ b/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