diff --git a/src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java b/src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java index 1537eaf..980d444 100644 --- a/src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java +++ b/src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java @@ -653,13 +653,13 @@ public class AliPayController { // orders.setProjectBenefits(projectBenefits); orders.setProjectBenefits(artificerPrice); - UserEntity user = userService.selectUserById(orders.getUserId()); + UserEntity artificerUser = userService.selectUserById(artificer.getUserId()); //经纪人分佣 orders.setJjrMoney(BigDecimal.ZERO); orders.setJjrArtificerDeductMoney(BigDecimal.ZERO); JjrConfig jc = jjrConfigService.getOne(new QueryWrapper()); if(jc!=null && jc.getIsOpen().equals(1)){ - UserEntity jjrUser = userService.queryByInvitationCode(user.getBlJjrCode()); + UserEntity jjrUser = userService.queryByInvitationCode(artificerUser.getBlJjrCode()); if(jjrUser!=null){ JjrApply jjrApply = jjrApplyService.findByUserId(jjrUser.getUserId()); if(jjrApply!=null && jjrApply.getStatus().equals(1)){ @@ -672,7 +672,7 @@ public class AliPayController { if(jc.getType().equals(1)){ jjrRate = jc.getRate(); }else{ - int invitationCn = jjrApplyService.getInvitationCn(user.getBlJjrCode()); + int invitationCn = jjrApplyService.getInvitationCn(artificerUser.getBlJjrCode()); List list = jjrConfigServiceLevel.findList(null); for(int i=0;i()); if(fc!=null && fc.getIsOpen().equals(1)){ + UserEntity user = userService.selectUserById(orders.getUserId()); UserEntity fxyOneUser = userService.queryByInvitationCode(user.getBlFxyCode()); if(fxyOneUser!=null){ FxyApply faOne = fxyApplyService.findByUserId(fxyOneUser.getUserId()); @@ -1760,13 +1761,13 @@ public class AliPayController { // } // orders.setOneArtificerMoney(oneArtificerMoney); - UserEntity user = userService.selectUserById(orders.getUserId()); + UserEntity artificerUser = userService.selectUserById(artificer.getUserId()); //经纪人分佣 orders.setJjrMoney(BigDecimal.ZERO); orders.setJjrArtificerDeductMoney(BigDecimal.ZERO); JjrConfig jc = jjrConfigService.getOne(new QueryWrapper()); if(jc!=null && jc.getIsOpen().equals(1)){ - UserEntity jjrUser = userService.queryByInvitationCode(user.getBlJjrCode()); + UserEntity jjrUser = userService.queryByInvitationCode(artificerUser.getBlJjrCode()); if(jjrUser!=null){ JjrApply jjrApply = jjrApplyService.findByUserId(jjrUser.getUserId()); if(jjrApply!=null && jjrApply.getStatus().equals(1)){ @@ -1779,7 +1780,7 @@ public class AliPayController { if(jc.getType().equals(1)){ jjrRate = jc.getRate(); }else{ - int invitationCn = jjrApplyService.getInvitationCn(user.getBlJjrCode()); + int invitationCn = jjrApplyService.getInvitationCn(artificerUser.getBlJjrCode()); List list = jjrConfigServiceLevel.findList(null); for(int i=0;i()); if(fc!=null && fc.getIsOpen().equals(1)){ + UserEntity user = userService.selectUserById(orders.getUserId()); UserEntity fxyOneUser = userService.queryByInvitationCode(user.getBlFxyCode()); if(fxyOneUser!=null){ FxyApply faOne = fxyApplyService.findByUserId(fxyOneUser.getUserId()); @@ -2354,13 +2356,13 @@ public class AliPayController { // } // orders.setOneArtificerMoney(oneArtificerMoney); - UserEntity user = userService.selectUserById(orders.getUserId()); + UserEntity artificerUser = userService.selectUserById(artificer.getUserId()); //经纪人分佣 orders.setJjrMoney(BigDecimal.ZERO); orders.setJjrArtificerDeductMoney(BigDecimal.ZERO); JjrConfig jc = jjrConfigService.getOne(new QueryWrapper()); if(jc!=null && jc.getIsOpen().equals(1)){ - UserEntity jjrUser = userService.queryByInvitationCode(user.getBlJjrCode()); + UserEntity jjrUser = userService.queryByInvitationCode(artificerUser.getBlJjrCode()); if(jjrUser!=null){ JjrApply jjrApply = jjrApplyService.findByUserId(jjrUser.getUserId()); if(jjrApply!=null && jjrApply.getStatus().equals(1)){ @@ -2373,7 +2375,7 @@ public class AliPayController { if(jc.getType().equals(1)){ jjrRate = jc.getRate(); }else{ - int invitationCn = jjrApplyService.getInvitationCn(user.getBlJjrCode()); + int invitationCn = jjrApplyService.getInvitationCn(artificerUser.getBlJjrCode()); List list = jjrConfigServiceLevel.findList(null); for(int i=0;i()); if(fc!=null && fc.getIsOpen().equals(1)){ + UserEntity user = userService.selectUserById(orders.getUserId()); UserEntity fxyOneUser = userService.queryByInvitationCode(user.getBlFxyCode()); if(fxyOneUser!=null){ FxyApply faOne = fxyApplyService.findByUserId(fxyOneUser.getUserId()); diff --git a/src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java b/src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java index 1a98b0e..cd99236 100644 --- a/src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java +++ b/src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java @@ -897,13 +897,13 @@ public class WxServiceImpl implements WxService { orders.setProjectBenefits(artificerPrice); - UserEntity user = userService.selectUserById(orders.getUserId()); + UserEntity artificerUser = userService.selectUserById(artificer.getUserId()); //经纪人分佣 orders.setJjrMoney(BigDecimal.ZERO); orders.setJjrArtificerDeductMoney(BigDecimal.ZERO); JjrConfig jc = jjrConfigService.getOne(new QueryWrapper()); if(jc!=null && jc.getIsOpen().equals(1)){ - UserEntity jjrUser = userService.queryByInvitationCode(user.getBlJjrCode()); + UserEntity jjrUser = userService.queryByInvitationCode(artificerUser.getBlJjrCode()); if(jjrUser!=null){ JjrApply jjrApply = jjrApplyService.findByUserId(jjrUser.getUserId()); if(jjrApply!=null && jjrApply.getStatus().equals(1)){ @@ -916,7 +916,7 @@ public class WxServiceImpl implements WxService { if(jc.getType().equals(1)){ jjrRate = jc.getRate(); }else{ - int invitationCn = jjrApplyService.getInvitationCn(user.getBlJjrCode()); + int invitationCn = jjrApplyService.getInvitationCn(artificerUser.getBlJjrCode()); List list = jjrConfigServiceLevel.findList(null); for(int i=0;i()); if(fc!=null && fc.getIsOpen().equals(1)){ + UserEntity user = userService.selectUserById(orders.getUserId()); UserEntity fxyOneUser = userService.queryByInvitationCode(user.getBlFxyCode()); if(fxyOneUser!=null){ FxyApply faOne = fxyApplyService.findByUserId(fxyOneUser.getUserId()); @@ -1681,13 +1682,13 @@ public class WxServiceImpl implements WxService { // orders.setProjectBenefits(projectBenefits); orders.setProjectBenefits(artificerPrice); - UserEntity user = userService.selectUserById(orders.getUserId()); + UserEntity artificerUser = userService.selectUserById(artificer.getUserId()); //经纪人分佣 orders.setJjrMoney(BigDecimal.ZERO); orders.setJjrArtificerDeductMoney(BigDecimal.ZERO); JjrConfig jc = jjrConfigService.getOne(new QueryWrapper()); if(jc!=null && jc.getIsOpen().equals(1)){ - UserEntity jjrUser = userService.queryByInvitationCode(user.getBlJjrCode()); + UserEntity jjrUser = userService.queryByInvitationCode(artificerUser.getBlJjrCode()); if(jjrUser!=null){ JjrApply jjrApply = jjrApplyService.findByUserId(jjrUser.getUserId()); if(jjrApply!=null && jjrApply.getStatus().equals(1)){ @@ -1700,7 +1701,7 @@ public class WxServiceImpl implements WxService { if(jc.getType().equals(1)){ jjrRate = jc.getRate(); }else{ - int invitationCn = jjrApplyService.getInvitationCn(user.getBlJjrCode()); + int invitationCn = jjrApplyService.getInvitationCn(artificerUser.getBlJjrCode()); List list = jjrConfigServiceLevel.findList(null); for(int i=0;i()); if(fc!=null && fc.getIsOpen().equals(1)){ + UserEntity user = userService.selectUserById(orders.getUserId()); UserEntity fxyOneUser = userService.queryByInvitationCode(user.getBlFxyCode()); if(fxyOneUser!=null){ FxyApply faOne = fxyApplyService.findByUserId(fxyOneUser.getUserId()); @@ -2684,13 +2686,13 @@ public class WxServiceImpl implements WxService { // orders.setProjectBenefits(projectBenefits); orders.setProjectBenefits(artificerPrice); - UserEntity user = userService.selectUserById(orders.getUserId()); + UserEntity artificerUser = userService.selectUserById(artificer.getUserId()); //经纪人分佣 orders.setJjrMoney(BigDecimal.ZERO); orders.setJjrArtificerDeductMoney(BigDecimal.ZERO); JjrConfig jc = jjrConfigService.getOne(new QueryWrapper()); if(jc!=null && jc.getIsOpen().equals(1)){ - UserEntity jjrUser = userService.queryByInvitationCode(user.getBlJjrCode()); + UserEntity jjrUser = userService.queryByInvitationCode(artificerUser.getBlJjrCode()); if(jjrUser!=null){ JjrApply jjrApply = jjrApplyService.findByUserId(jjrUser.getUserId()); if(jjrApply!=null && jjrApply.getStatus().equals(1)){ @@ -2703,7 +2705,7 @@ public class WxServiceImpl implements WxService { if(jc.getType().equals(1)){ jjrRate = jc.getRate(); }else{ - int invitationCn = jjrApplyService.getInvitationCn(user.getBlJjrCode()); + int invitationCn = jjrApplyService.getInvitationCn(artificerUser.getBlJjrCode()); List list = jjrConfigServiceLevel.findList(null); for(int i=0;i()); if(fc!=null && fc.getIsOpen().equals(1)){ + UserEntity user = userService.selectUserById(orders.getUserId()); UserEntity fxyOneUser = userService.queryByInvitationCode(user.getBlFxyCode()); if(fxyOneUser!=null){ FxyApply faOne = fxyApplyService.findByUserId(fxyOneUser.getUserId());