10.25 修改退款减金币

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);

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,