From f3b8f3350a851379748e2ec0dcc7db428dad1511 Mon Sep 17 00:00:00 2001 From: lijianlin Date: Sat, 10 Jan 2026 19:35:28 +0800 Subject: [PATCH] =?UTF-8?q?01-10=20=E9=80=80=E6=AC=BE=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=E7=B4=AF=E5=85=85=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/example/demo/serviceImpl/coin/AuditServiceImpl.java | 10 ++++++---- src/main/resources/mapper/RefundMapper.xml | 6 ++++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java index 5dfec2f..235613c 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java @@ -210,9 +210,10 @@ public class AuditServiceImpl implements AuditService { redMapper.update(order.getJwcode(),type,order.getPrice().divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP)); }//金币充值退款 else if (oldOrder.getType()==0){ + int type = 1; //红包充值累计 //额外扣金币抵扣红包 if (order.getAuditStatus()==4){ - int type = 1; //红包充值累计 + // 检查用户余额是否足够抵扣红包差额 @@ -258,9 +259,7 @@ public class AuditServiceImpl implements AuditService { redService.updateRed(consumeUser); //link扣除已有红包 redService.consumeRed(linkId); - // 执行审核更新 - redMapper.update(order.getJwcode(),type,order.getPrice().divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP)); - } + } //link扣除已有红包 else if (!AuditContext.getRedCheckResult().equals("old")){ redService.consumeRed(linkId); @@ -273,6 +272,9 @@ public class AuditServiceImpl implements AuditService { "\n退款类型:"+order.getRefundType()+"\n商品名:"+order.getGoodsName()+"\n备注:"+order.getRemark(); GlobalExceptionHandler.sendFeishuAlert(e, title, detail); } + // 执行审核更新 + redMapper.update(order.getJwcode(),type,order.getPrice().divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP)); + if(order.getTaskGold()==0){ //无任务金币统一走免费+永久 GoldTistV2.addCoinNew(order.getJwcode().toString(), 58, //退款免费+永久金币-充值 (double) (order.getFreeDecember()+order.getFreeJune()+order.getPermanentGold() ) /100,SimpleIdGenerator.generateId(), diff --git a/src/main/resources/mapper/RefundMapper.xml b/src/main/resources/mapper/RefundMapper.xml index 40c799c..627b3f5 100644 --- a/src/main/resources/mapper/RefundMapper.xml +++ b/src/main/resources/mapper/RefundMapper.xml @@ -234,7 +234,8 @@ audit_status, create_time, update_time, - price + price, + link_id VALUES @@ -255,7 +256,8 @@ #{auditStatus}, #{createTime}, #{updateTime}, - #{price} + #{price}, + #{linkId}