diff --git a/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java b/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java index 8a583ba..6ec0456 100644 --- a/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java +++ b/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java @@ -5438,13 +5438,13 @@ public class OrdersServiceImpl extends ServiceImpl implements 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)){ @@ -5457,7 +5457,7 @@ public class OrdersServiceImpl extends ServiceImpl implements 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 implements } } } - UserEntity artificerUser = userService.selectUserById(artificer.getUserId()); + BigDecimal shopMoney = BigDecimal.ZERO; if (artificerUser.getConsortiaId() != null) { Consortia consortia = consortiaService.getById(artificerUser.getConsortiaId()); @@ -5509,6 +5509,7 @@ public class OrdersServiceImpl extends ServiceImpl implements orders.setFxyTwoArtificerDeductMoney(BigDecimal.ZERO); FxyConfig fc = fxyConfigService.getOne(new QueryWrapper()); 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());