diff --git a/rc-service/rc-service-wallet/wallet-application/src/main/java/com/red/circle/wallet/app/command/bank/UserBankExchangeGoldCmdExe.java b/rc-service/rc-service-wallet/wallet-application/src/main/java/com/red/circle/wallet/app/command/bank/UserBankExchangeGoldCmdExe.java index f5199867..b4c95f20 100644 --- a/rc-service/rc-service-wallet/wallet-application/src/main/java/com/red/circle/wallet/app/command/bank/UserBankExchangeGoldCmdExe.java +++ b/rc-service/rc-service-wallet/wallet-application/src/main/java/com/red/circle/wallet/app/command/bank/UserBankExchangeGoldCmdExe.java @@ -173,10 +173,10 @@ public class UserBankExchangeGoldCmdExe { userSvipClient.incrIntegral(cmd.getReqUserId(), goldQuantity.longValue()); redisService.unlock(key); - // 被邀请人充值邀请人获得佣金 - inviteUserClient.processRechargeCommission(goldQuantity, - cmd.getReqSysOrigin().getOrigin(), cmd.getReqUserId()); - + // 被邀请人充值邀请人获得佣金 + if (!freight) { + inviteUserClient.processRechargeCommission(goldQuantity, cmd.getReqSysOrigin().getOrigin(), cmd.getReqUserId()); + } completedFirstCharge(cmd.getReqUserId(), cmd.getReqSysOrigin().getOrigin()); return new UserBankExchangeGoldResultCO() .setBankBalance(decrUserBankBalanceDTO.getAccurateBalance()) 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 56fe04c6..c7c8876f 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 @@ -167,6 +167,9 @@ public class SendFreightShipCmdExe { .setCreateTime(cmd.reqTimeElseNow()) ); + // 被邀请人充值邀请人获得佣金 + inviteUserClient.processRechargeCommission(cmd.getQuantity(), cmd.getReqSysOrigin().getOrigin(), cmd.getAcceptUserId()); + try { String noticeContent = getNoticeContent(cmd, cmd.getQuantity()); officialNoticeClient.send( @@ -193,10 +196,6 @@ public class SendFreightShipCmdExe { // SVip积分累计. userSvipClient.incrIntegral(cmd.getAcceptUserId(), cmd.getQuantity().longValue()); - // 被邀请人充值邀请人获得佣金 - inviteUserClient.processRechargeCommission(cmd.getQuantity(), - cmd.getReqSysOrigin().getOrigin(), cmd.getAcceptUserId()); - completedFirstCharge(cmd.getAcceptUserId(), cmd.getReqSysOrigin().getOrigin()); return balance; diff --git a/rc-service/rc-service-wallet/wallet-application/src/main/java/com/red/circle/wallet/app/command/salary/SalaryExchangeGoldCmdExe.java b/rc-service/rc-service-wallet/wallet-application/src/main/java/com/red/circle/wallet/app/command/salary/SalaryExchangeGoldCmdExe.java index e462e226..a134f465 100644 --- a/rc-service/rc-service-wallet/wallet-application/src/main/java/com/red/circle/wallet/app/command/salary/SalaryExchangeGoldCmdExe.java +++ b/rc-service/rc-service-wallet/wallet-application/src/main/java/com/red/circle/wallet/app/command/salary/SalaryExchangeGoldCmdExe.java @@ -136,8 +136,9 @@ public class SalaryExchangeGoldCmdExe { ); // 被邀请人充值邀请人获得佣金 - inviteUserClient.processRechargeCommission(goldQuantity, - cmd.getReqSysOrigin().getOrigin(), cmd.getReqUserId()); + if (!freight) { + inviteUserClient.processRechargeCommission(goldQuantity, cmd.getReqSysOrigin().getOrigin(), cmd.getReqUserId()); + } completedFirstCharge(cmd.getReqUserId(), cmd.getReqSysOrigin().getOrigin()); redisService.unlock(key);