From f219fffe35b6da0d69e9820b613f99945741fc55 Mon Sep 17 00:00:00 2001 From: huangqizhen <15552608129@163.com> Date: Sat, 25 Oct 2025 09:19:44 +0800 Subject: [PATCH] =?UTF-8?q?10.25=20=E4=BF=AE=E6=94=B9=E9=80=80=E6=AC=BE?= =?UTF-8?q?=E5=87=8F=E9=87=91=E5=B8=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java | 2 +- .../example/demo/serviceImpl/cash/CashRefundServiceImpl.java | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java b/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java index 45b11c7..186ccc7 100644 --- a/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java +++ b/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java @@ -248,7 +248,7 @@ public class MysqlServiceImpl implements MysqlService { if (validZeroTypes.contains(data.gtype)) { stmt.setInt(13, 0); - stmt.setNull(20, Types.INTEGER); + stmt.setNull(20, 0); stmt.setString(1, "ERPCZ_" + data.orderNumber); } else if (validOneTypes.contains(data.gtype)) { stmt.setInt(13, 1); diff --git a/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java index 5f2f0c3..53ea1ee 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java @@ -167,6 +167,12 @@ CashRecordDone cashRecordDone1 = new CashRecordDone(); @Override public int finalreview(CashRecordDone cashRecordDone) { + if(cashRecordDone.getPermanentGold()== null){ + cashRecordDone.setPermanentGold(0); + } + if(cashRecordDone.getFreeGold()== null){ + cashRecordDone.setFreeGold(0); + } if(cashRecordDone.getStatus()== 32){ CashRecordDone cashRecordDone1 = new CashRecordDone(); cashRecordDone1.setOrderCode(cashRecordDone.getOrderCode().substring(2)); @@ -208,9 +214,9 @@ CashRecordDone cashRecordDone1 = new CashRecordDone(); refundMapper.add(userGoldRecord); User user = new User(); user.setJwcode(userGoldRecord.getJwcode()); - user.setCurrentPermanentGold(BigDecimal.valueOf(userGoldRecord.getPermanentGold())); //当前永久金币 - user.setCurrentFreeJune(BigDecimal.valueOf(userGoldRecord.getFreeJune())); //当前六月免费金币 - user.setCurrentFreeDecember(BigDecimal.valueOf(userGoldRecord.getFreeDecember())); //当前十二月免费金币 + user.setCurrentPermanentGold(BigDecimal.valueOf(-userGoldRecord.getPermanentGold())); //当前永久金币 + user.setCurrentFreeJune(BigDecimal.valueOf(-userGoldRecord.getFreeJune())); //当前六月免费金币 + user.setCurrentFreeDecember(BigDecimal.valueOf(-userGoldRecord.getFreeDecember())); //当前十二月免费金币 auditMapper.updateUserGold(user); GoldTistV2.addCoinNew(userGoldRecord.getJwcode().toString(), 58, //退款免费+永久金币-充值 (double) (userGoldRecord.getFreeDecember()+userGoldRecord.getFreeJune()+userGoldRecord.getPermanentGold() ) /100,