批量充值问题修复

fuint-application/src/main/java/com/fuint/common/service/BalanceService.java

@@ -29,9 +29,10 @@ public interface BalanceService extends IService<MtBalance> {
      * 添加余额记录
      *
      * @param reqDto
+     * @param updateBalance
      * @throws BusinessCheckException
      */
-    Boolean addBalance(MtBalance reqDto) throws BusinessCheckException;
+    Boolean addBalance(MtBalance reqDto, Boolean updateBalance) throws BusinessCheckException;
 
     /**
      * 发放余额

fuint-application/src/main/java/com/fuint/common/service/impl/BalanceServiceImpl.java

@@ -132,12 +132,13 @@ public class BalanceServiceImpl extends ServiceImpl<MtBalanceMapper, MtBalance>
      * 添加余额记录
      *
      * @param  mtBalance
+     * @param  updateBalance
      * @throws BusinessCheckException
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
     @OperationServiceLog(description = "会员余额变动")
-    public Boolean addBalance(MtBalance mtBalance) throws BusinessCheckException {
+    public Boolean addBalance(MtBalance mtBalance, Boolean updateBalance) throws BusinessCheckException {
         if (mtBalance.getUserId() < 0) {
             return false;
         }
@@ -154,8 +155,10 @@ public class BalanceServiceImpl extends ServiceImpl<MtBalanceMapper, MtBalance>
             mtBalance.setStoreId(mtUser.getStoreId());
         }
         mtBalance.setMerchantId(mtUser.getMerchantId());
-        mtUser.setBalance(newAmount);
-        mtUserMapper.updateById(mtUser);
+        if (updateBalance) {
+            mtUser.setBalance(newAmount);
+            mtUserMapper.updateById(mtUser);
+        }
 
         if (PhoneFormatCheckUtils.isChinaPhoneLegal(mtUser.getMobile())) {
             mtBalance.setMobile(mtUser.getMobile());
@@ -219,7 +222,7 @@ public class BalanceServiceImpl extends ServiceImpl<MtBalanceMapper, MtBalance>
                 mtBalance.setMerchantId(accountInfo.getMerchantId());
                 mtBalance.setDescription(remark);
                 mtBalance.setOperator(accountInfo.getAccountName());
-                addBalance(mtBalance);
+                addBalance(mtBalance, false);
             }
         }
     }

fuint-application/src/main/java/com/fuint/common/service/impl/OrderServiceImpl.java

@@ -927,7 +927,7 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
                 balance.setMerchantId(userInfo.getMerchantId());
                 BigDecimal balanceAmount = realPayAmount.subtract(realPayAmount).subtract(realPayAmount);
                 balance.setAmount(balanceAmount);
-                boolean isPay = balanceService.addBalance(balance);
+                boolean isPay = balanceService.addBalance(balance, true);
                 if (isPay) {
                     setOrderPayed(orderInfo.getId(), realPayAmount);
                 } else {

fuint-application/src/main/java/com/fuint/common/service/impl/PaymentServiceImpl.java

@@ -142,7 +142,7 @@ public class PaymentServiceImpl implements PaymentService {
                 if (params.length == 2) {
                     BigDecimal amount = new BigDecimal(params[0]).add(new BigDecimal(params[1]));
                     mtBalance.setAmount(amount);
-                    balanceService.addBalance(mtBalance);
+                    balanceService.addBalance(mtBalance, true);
                 }
             }
         }
@@ -222,7 +222,7 @@ public class PaymentServiceImpl implements PaymentService {
             balance.setUserId(mtUser.getId());
             BigDecimal balanceAmount = realPayAmount.subtract(realPayAmount).subtract(realPayAmount);
             balance.setAmount(balanceAmount);
-            boolean isPay = balanceService.addBalance(balance);
+            boolean isPay = balanceService.addBalance(balance, true);
             if (isPay) {
                 orderService.setOrderPayed(orderInfo.getId(), balanceAmount);
                 OrderDto reqOrder = new OrderDto();

fuint-application/src/main/java/com/fuint/common/service/impl/RefundServiceImpl.java

@@ -393,7 +393,7 @@ public class RefundServiceImpl extends ServiceImpl<MtRefundMapper, MtRefund> imp
                        balanceReq.setStatus(StatusEnum.ENABLED.getKey());
                        balanceReq.setCreateTime(new Date());
                        balanceReq.setUpdateTime(new Date());
-                       balanceService.addBalance(balanceReq);
+                       balanceService.addBalance(balanceReq, true);
                    }
                }
             }

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendBalanceController.java

@@ -162,7 +162,7 @@ public class BackendBalanceController extends BaseController {
         mtBalance.setOperator(operator);
         mtBalance.setOrderSn("");
 
-        balanceService.addBalance(mtBalance);
+        balanceService.addBalance(mtBalance, true);
         return getSuccessResult(true);
     }