From 478db499674a7eaaafb36aaebd51bfcc8311c419 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Fri, 9 Aug 2024 14:23:56 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=8F=E7=BA=AA=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OrdersServiceImpl.java | 54 +++++++++++-------- 1 file changed, 31 insertions(+), 23 deletions(-) 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 6ec0456..c00860f 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 @@ -1336,13 +1336,14 @@ public class OrdersServiceImpl extends ServiceImpl implements // oneArtificerMoney = oneArtificerMoney.setScale(0, BigDecimal.ROUND_HALF_UP); // } // ordersOld.setOneArtificerMoney(oneArtificerMoney); - UserEntity user = userService.selectUserById(orders.getUserId()); + + UserEntity artificerUser = userService.selectUserById(artificer.getUserId()); //经纪人分佣 ordersOld.setJjrMoney(BigDecimal.ZERO); ordersOld.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)){ @@ -1355,7 +1356,7 @@ public class OrdersServiceImpl extends ServiceImpl implements if(jc.getType().equals(1)){ rate = 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()); @@ -1407,6 +1408,7 @@ public class OrdersServiceImpl extends ServiceImpl implements ordersOld.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()); @@ -1969,13 +1971,14 @@ 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)){ @@ -1988,7 +1991,7 @@ public class OrdersServiceImpl extends ServiceImpl implements if(jc.getType().equals(1)){ rate = 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()); @@ -2040,6 +2043,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()); @@ -2326,13 +2330,13 @@ public class OrdersServiceImpl extends ServiceImpl implements //计算技师项目提成金额 ordersOld.setProjectBenefits(oldArtificerPrice); } - UserEntity user = userService.selectUserById(orders.getUserId()); + UserEntity artificerUser = userService.selectUserById(artificer.getUserId()); //经纪人分佣 ordersOld.setJjrMoney(BigDecimal.ZERO); ordersOld.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)){ @@ -2345,7 +2349,7 @@ public class OrdersServiceImpl extends ServiceImpl implements if(jc.getType().equals(1)){ rate = 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()); @@ -2397,6 +2401,7 @@ public class OrdersServiceImpl extends ServiceImpl implements ordersOld.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()); @@ -2866,13 +2871,13 @@ public class OrdersServiceImpl extends ServiceImpl implements orders.setArtificerTaxiMoney(artificerTaxiMoney); orders.setPingTaxiMoney(pingTaxiMoney); - 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)){ @@ -2885,7 +2890,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()); @@ -2937,6 +2942,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()); @@ -3442,13 +3448,13 @@ public class OrdersServiceImpl extends ServiceImpl implements orders.setArtificerTaxiMoney(artificerTaxiMoney); orders.setPingTaxiMoney(pingTaxiMoney); - 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)){ @@ -3461,7 +3467,7 @@ public class OrdersServiceImpl extends ServiceImpl implements } } } - UserEntity artificerUser = userService.selectUserById(artificer.getUserId()); + BigDecimal shopMoney = BigDecimal.ZERO; if (artificerUser.getConsortiaId() != null) { Consortia consortia = consortiaService.getById(artificerUser.getConsortiaId()); @@ -3483,6 +3489,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()); @@ -5985,13 +5992,13 @@ public class OrdersServiceImpl extends ServiceImpl implements orders.setValueStorageDeduction(valueStorageDeduction); 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.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)){ @@ -6004,7 +6011,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()); @@ -6056,6 +6063,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());