diff --git a/rc-service/rc-service-wallet/wallet-application/src/main/java/com/red/circle/wallet/app/command/freight/SendFreightShipCmdExe.java b/rc-service/rc-service-wallet/wallet-application/src/main/java/com/red/circle/wallet/app/command/freight/SendFreightShipCmdExe.java index fd81cbc5..56fe04c6 100644 --- a/rc-service/rc-service-wallet/wallet-application/src/main/java/com/red/circle/wallet/app/command/freight/SendFreightShipCmdExe.java +++ b/rc-service/rc-service-wallet/wallet-application/src/main/java/com/red/circle/wallet/app/command/freight/SendFreightShipCmdExe.java @@ -117,6 +117,7 @@ public class SendFreightShipCmdExe { // 判断发送者和接收者的代理类型 boolean senderIsSuperFreight = freightBalanceService.checkSuperFreightAgent(cmd.requiredReqUserId()); + boolean acceptIsSuperFreight = freightBalanceService.checkSuperFreightAgent(cmd.getAcceptUserId()); boolean acceptIsFreight = freightBalanceService.checkFreightAgent(cmd.getAcceptUserId()); // 扣款失败 @@ -131,7 +132,7 @@ public class SendFreightShipCmdExe { FreightBalanceRunningWater runningWater = saveRunningWater(cmd, balance); // 发货:目标是普通经销商 → incrCandyBalance 进货运钱包;目标是超级经销商(或普通用户) → changeBalance 进金币钱包 - if (senderIsSuperFreight && acceptIsFreight) { + if (senderIsSuperFreight && acceptIsFreight && !acceptIsSuperFreight) { // 目标是经销商,入货运余额 ResponseAssert.isTrue(WalletErrorCode.DEDUCTION_FAILED, freightBalanceService.incrCandyBalance(