20260322 充值优化

src/main/java/com/example/demo/serviceImpl/cash/CashAuditServiceImpl.java

@@ -110,33 +110,6 @@ public class CashAuditServiceImpl implements CashAuditService {
                 rechargeOrder.setLinkId(order.getLinkId());
                 rechargeMapper.add(rechargeOrder);
 
-                //往 ERP 加一条充值数据
-                GoldTistV2.addCoinNew(order.getJwcode().toString(), 64, //充值永久金币
-                        (double) (order.getPermanentGold()) / 100,order.getLinkId(),
-                        order.getRemark(), (double) (order.getPermanentGold()) / 100, auditName, "金币充值");
-                GoldTistV2.addCoinNew(order.getJwcode().toString(), 63, //充值免费
-                        (double) (order.getFreeGold()) / 100,order.getLinkId(),
-                        order.getRemark(), 0, auditName, "金币充值");
-                //修改用户余额，添加金币
-                User user = new User();
-                user.setJwcode(order.getJwcode());
-                user.setSumConsumePermanent(BigDecimal.valueOf(order.getPermanentGold()));
-                // 根据当前月份设置对应字段
-                if (currentMonth >= 1 && currentMonth <= 6) {
-                    // 1-6 月：设置 12 月额度，6 月保持默认值
-                    user.setSumFreeJune(BigDecimal.valueOf(0));
-                    user.setSumFreeDecember(BigDecimal.valueOf(order.getFreeGold()));
-                    user.setCurrentFreeDecember(BigDecimal.valueOf(order.getFreeGold()));
-                } else {
-                    // 7-12 月：设置 6 月额度，12 月保持默认值
-                    user.setSumFreeJune(BigDecimal.valueOf(order.getFreeGold()));
-                    user.setCurrentFreeJune(BigDecimal.valueOf(order.getFreeGold()));
-                    user.setSumFreeDecember(BigDecimal.valueOf(0));
-                }
-                user.setCurrentPermanentGold(BigDecimal.valueOf(order.getPermanentGold()));
-                user.setRechargeNum(1); //充值次数加一
-                auditMapper.updateUserGold(user);
-
                 // 先从数据库中获取订单的 walletId
                 CashRecord dbRecord = cashCollectionMapper.selectByOrderCode(orderCode);
                 Integer walletId = dbRecord != null ? dbRecord.getWalletId() : null;
@@ -184,6 +157,33 @@ public class CashAuditServiceImpl implements CashAuditService {
                         // 不抛出异常，避免影响主流程，但记录错误日志
                     }
                 }
+
+                //往 ERP 加一条充值数据
+                GoldTistV2.addCoinNew(order.getJwcode().toString(), 64, //充值永久金币
+                        (double) (order.getPermanentGold()) / 100,order.getLinkId(),
+                        order.getRemark(), (double) (order.getPermanentGold()) / 100, auditName, "金币充值");
+                GoldTistV2.addCoinNew(order.getJwcode().toString(), 63, //充值免费
+                        (double) (order.getFreeGold()) / 100,order.getLinkId(),
+                        order.getRemark(), 0, auditName, "金币充值");
+                //修改用户余额，添加金币
+                User user = new User();
+                user.setJwcode(order.getJwcode());
+                user.setSumConsumePermanent(BigDecimal.valueOf(order.getPermanentGold()));
+                // 根据当前月份设置对应字段
+                if (currentMonth >= 1 && currentMonth <= 6) {
+                    // 1-6 月：设置 12 月额度，6 月保持默认值
+                    user.setSumFreeJune(BigDecimal.valueOf(0));
+                    user.setSumFreeDecember(BigDecimal.valueOf(order.getFreeGold()));
+                    user.setCurrentFreeDecember(BigDecimal.valueOf(order.getFreeGold()));
+                } else {
+                    // 7-12 月：设置 6 月额度，12 月保持默认值
+                    user.setSumFreeJune(BigDecimal.valueOf(order.getFreeGold()));
+                    user.setCurrentFreeJune(BigDecimal.valueOf(order.getFreeGold()));
+                    user.setSumFreeDecember(BigDecimal.valueOf(0));
+                }
+                user.setCurrentPermanentGold(BigDecimal.valueOf(order.getPermanentGold()));
+                user.setRechargeNum(1); //充值次数加一
+                auditMapper.updateUserGold(user);
             }
             if (order.getGoodsName().equals("免费金币赠送")) {
                 //往金币订单表加一条充值记录