From d4a4e360282fb9421789b4532d4ec9d7b0636308 Mon Sep 17 00:00:00 2001 From: lijianlin Date: Mon, 12 Jan 2026 16:54:50 +0800 Subject: [PATCH] =?UTF-8?q?01-12=200=E9=87=91=E5=B8=81=E6=B6=88=E8=B4=B9?= =?UTF-8?q?=E4=B8=8E=E9=80=80=E6=AC=BE=E8=AE=A2=E5=8D=95=E4=BC=A0erp?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/example/demo/serviceImpl/coin/AuditServiceImpl.java | 10 ++++++++-- .../com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java | 4 ++++ 2 files changed, 12 insertions(+), 2 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 5ae13ee..a2b7b14 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java @@ -198,6 +198,7 @@ public class AuditServiceImpl implements AuditService { //erp增加退款数据 if(oldOrder.getType()==1){ int type = 2; + if (order.getPermanentGold()!=0||order.getFreeJune()!=0||order.getFreeDecember()!=0||order.getTaskGold()!=0){ GoldTistV2.addCoinNew(order.getJwcode().toString(), 55, //退款免费-商品 (double) (order.getFreeDecember()+order.getFreeJune()) /100,SimpleIdGenerator.generateId(), order.getRemark(),0, auditName, "退款商品"+order.getGoodsName()); @@ -206,7 +207,12 @@ public class AuditServiceImpl implements AuditService { order.getRemark(),order.getPermanentGold(), auditName, "退款商品"+order.getGoodsName()); GoldTistV2.addCoinNew(order.getJwcode().toString(), 57, //退款任务-商品 (double) (order.getTaskGold() ) /100,SimpleIdGenerator.generateId(), - order.getRemark(),0, auditName, "退款商品"+order.getGoodsName()); + order.getRemark(),0, auditName, "退款商品"+order.getGoodsName());} + else { + //0金币消耗，往erp传一条金币为空的记录 + GoldTistV2.addCoinRecordNew(String.valueOf(order.getJwcode()), order.getRemark(),auditName,order.getGoodsName()); + + } //如果是旧订单，发送报警 if (AuditContext.getRedCheckResult().equals("old")){ Exception e = new Exception("旧订单退款"); @@ -222,7 +228,7 @@ public class AuditServiceImpl implements AuditService { else if (oldOrder.getType()==0){ //判断够不够扣 - if(userNow.getNowPermanentGold().compareTo(BigDecimal.valueOf(Math.abs(order.getPermanentGold()))) < 0 + if(userNow.getNowPermanentGold().compareTo(BigDecimal.valueOf(Math.abs(order.getPermanentGold()))) < 0 || userNow.getNowFreeGold().compareTo(BigDecimal.valueOf(Math.abs(order.getFreeDecember() + order.getFreeJune()))) < 0 || userNow.getNowTaskGold().compareTo(BigDecimal.valueOf(Math.abs(order.getTaskGold()))) < 0){ log.error("用户余额不足，无法退款"); diff --git a/src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java index 86751cd..12fcd25 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java @@ -185,6 +185,10 @@ public class ConsumeServiceImpl implements ConsumeService { } } } + //0金币消耗，往erp传一条金币为空的记录 + else if (consumeUser.getPermanentGold().compareTo(BigDecimal.ZERO)==0&&consumeUser.getFreeGold().compareTo(BigDecimal.ZERO)==0&&consumeUser.getTaskGold().compareTo(BigDecimal.ZERO)==0){ + GoldTistV2.addCoinRecordNew(String.valueOf(consumeUser.getJwcode()), consumeUser.getRemark(),consumeUser.getAdminName(),consumeUser.getGoodsName()); + } consumeMapper.add(userGoldRecord); consumeMapper.updateUserGold(userGoldRecord); User user = new User();