fixed 权限问题

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

@@ -148,10 +148,7 @@ public class BalanceServiceImpl extends ServiceImpl<MtBalanceMapper, MtBalance>
         if (mtUser.getStoreId() != null) {
             mtBalance.setStoreId(mtUser.getStoreId());
         }
-        if (!mtUser.getMerchantId().equals(mtBalance.getMerchantId())) {
-            throw new BusinessCheckException("没有操作权限");
-        }
-
+        mtBalance.setMerchantId(mtUser.getMerchantId());
         mtUser.setBalance(newAmount);
         mtUserMapper.updateById(mtUser);
 

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

@@ -142,6 +142,7 @@ public class PaymentServiceImpl implements PaymentService {
             }
             mtBalance.setOrderSn(orderInfo.getOrderSn());
             mtBalance.setUserId(orderInfo.getUserId());
+            mtBalance.setMerchantId(orderInfo.getMerchantId());
             String param = orderInfo.getParam();
             if (StringUtil.isNotEmpty(param)) {
                 String params[] = param.split("_");

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

@@ -144,13 +144,11 @@ public class PointServiceImpl extends ServiceImpl<MtPointMapper, MtPoint> implem
         if (newAmount < 0) {
             return;
         }
-        if (!mtUser.getMerchantId().equals(mtPoint.getMerchantId())) {
-            throw new BusinessCheckException("没有操作权限");
-        }
         mtUser.setPoint(newAmount);
         if (mtUser.getStoreId() != null) {
             mtPoint.setStoreId(mtUser.getStoreId());
         }
+        mtPoint.setMerchantId(mtUser.getMerchantId());
         mtUserMapper.updateById(mtUser);
         mtPointMapper.insert(mtPoint);
 

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

@@ -399,6 +399,7 @@ public class RefundServiceImpl extends ServiceImpl<MtRefundMapper, MtRefund> imp
                    if (mtBalance.getAmount().compareTo(new BigDecimal("0")) < 0) {
                        MtBalance balanceReq = new MtBalance();
                        balanceReq.setUserId(orderInfo.getUserId());
+                       balanceReq.setMerchantId(orderInfo.getMerchantId());
                        balanceReq.setOrderSn(orderInfo.getOrderSn());
                        balanceReq.setMobile(orderInfo.getUserInfo().getMobile());
                        balanceReq.setAmount(mtBalance.getAmount().negate());

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

@@ -449,6 +449,7 @@ public class SettlementServiceImpl implements SettlementService {
                 balance.setMobile(userInfo.getMobile());
                 balance.setOrderSn(orderInfo.getOrderSn());
                 balance.setUserId(userInfo.getId());
+                balance.setMerchantId(userInfo.getMerchantId());
                 BigDecimal balanceAmount = realPayAmount.subtract(realPayAmount).subtract(realPayAmount);
                 balance.setAmount(balanceAmount);
                 boolean isPay = balanceService.addBalance(balance);