From 77f3c305430bed2b6795497af739530de460cd78 Mon Sep 17 00:00:00 2001 From: lijianlin Date: Tue, 13 Jan 2026 11:37:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?01-13=20=E6=B6=88=E8=80=97=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E6=96=B0=E5=A2=9E=E6=98=AF=E5=90=A6=E5=B7=B2=E9=80=80?= =?UTF-8?q?=E6=AC=BE=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/example/demo/serviceImpl/Temporary/RedServiceImpl.java | 2 +- src/main/resources/mapper/ConsumeMapper.xml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/example/demo/serviceImpl/Temporary/RedServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/Temporary/RedServiceImpl.java index 3de69fc..f04f402 100644 --- a/src/main/java/com/example/demo/serviceImpl/Temporary/RedServiceImpl.java +++ b/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); diff --git a/src/main/resources/mapper/ConsumeMapper.xml b/src/main/resources/mapper/ConsumeMapper.xml index 10d2428..734b2a7 100644 --- a/src/main/resources/mapper/ConsumeMapper.xml +++ b/src/main/resources/mapper/ConsumeMapper.xml @@ -109,6 +109,9 @@ AND ugr.jwcode = #{jwcode} + + AND ugr.is_refund = #{isRefund} + AND ugr.goods_name = #{goodsName} From ba338ccd8339eaeb9d901815a4d26c645e83cd82 Mon Sep 17 00:00:00 2001 From: lijianlin Date: Tue, 13 Jan 2026 13:54:39 +0800 Subject: [PATCH 2/2] =?UTF-8?q?01-13=20=E6=B6=88=E8=80=97=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=98=BE=E7=A4=BA=E5=B7=B2=E9=80=80=E6=AC=BE=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E7=9A=84=E6=B6=88=E8=80=97=E8=AF=A6=E6=83=85=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/example/demo/domain/vo/coin/ConsumeUser.java | 9 +++++++-- src/main/resources/mapper/ConsumeMapper.xml | 13 ++++++++++++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java b/src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java index 7460c8f..7e55021 100644 --- a/src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java +++ b/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 diff --git a/src/main/resources/mapper/ConsumeMapper.xml b/src/main/resources/mapper/ConsumeMapper.xml index 734b2a7..d19633c 100644 --- a/src/main/resources/mapper/ConsumeMapper.xml +++ b/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) + ) ugr.type = 1 AND ugr.flag = 1