From dd8e548135679ece1d932c05143c7ac84d62b178 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:30:46 +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

---
 .../pay/controller/app/AliPayController.java  | 27 ++++++++++---------
 .../pay/service/impl/WxServiceImpl.java       | 27 ++++++++++---------
 2 files changed, 30 insertions(+), 24 deletions(-)

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<JjrConfig>());
                             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<JjrConfigLevel> list = jjrConfigServiceLevel.findList(null);
                                                 for(int i=0;i<list.size();i++){
                                                     JjrConfigLevel jjrcl = list.get(i);
@@ -690,7 +690,7 @@ public class AliPayController {
                                     }
                                 }
                             }
-                            UserEntity artificerUser = userService.selectUserById(artificer.getUserId());
+
                             BigDecimal shopMoney = BigDecimal.ZERO;
                             if (artificerUser.getConsortiaId() != null) {
                                 Consortia consortia = consortiaService.getById(artificerUser.getConsortiaId());
@@ -724,6 +724,7 @@ public class AliPayController {
                             orders.setFxyTwoArtificerDeductMoney(BigDecimal.ZERO);
                             FxyConfig fc = fxyConfigService.getOne(new QueryWrapper<FxyConfig>());
                             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<JjrConfig>());
         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<JjrConfigLevel> list = jjrConfigServiceLevel.findList(null);
                             for(int i=0;i<list.size();i++){
                                 JjrConfigLevel jjrcl = list.get(i);
@@ -1797,7 +1798,7 @@ public class AliPayController {
                 }
             }
         }
-        UserEntity artificerUser = userService.selectUserById(artificer.getUserId());
+
         BigDecimal shopMoney = BigDecimal.ZERO;
         if (artificerUser.getConsortiaId() != null) {
             Consortia consortia = consortiaService.getById(artificerUser.getConsortiaId());
@@ -1831,6 +1832,7 @@ public class AliPayController {
         orders.setFxyTwoArtificerDeductMoney(BigDecimal.ZERO);
         FxyConfig fc = fxyConfigService.getOne(new QueryWrapper<FxyConfig>());
         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<JjrConfig>());
                         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<JjrConfigLevel> list = jjrConfigServiceLevel.findList(null);
                                             for(int i=0;i<list.size();i++){
                                                 JjrConfigLevel jjrcl = list.get(i);
@@ -2391,7 +2393,7 @@ public class AliPayController {
                                 }
                             }
                         }
-                        UserEntity artificerUser = userService.selectUserById(artificer.getUserId());
+
                         BigDecimal shopMoney = BigDecimal.ZERO;
                         if (artificerUser.getConsortiaId() != null) {
                             Consortia consortia = consortiaService.getById(artificerUser.getConsortiaId());
@@ -2425,6 +2427,7 @@ public class AliPayController {
                         orders.setFxyTwoArtificerDeductMoney(BigDecimal.ZERO);
                         FxyConfig fc = fxyConfigService.getOne(new QueryWrapper<FxyConfig>());
                         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<JjrConfig>());
         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<JjrConfigLevel> list = jjrConfigServiceLevel.findList(null);
                             for(int i=0;i<list.size();i++){
                                 JjrConfigLevel jjrcl = list.get(i);
@@ -934,7 +934,7 @@ public class WxServiceImpl implements WxService {
                 }
             }
         }
-        UserEntity artificerUser = userService.selectUserById(artificer.getUserId());
+
         BigDecimal shopMoney = BigDecimal.ZERO;
         if (artificerUser.getConsortiaId() != null) {
             Consortia consortia = consortiaService.getById(artificerUser.getConsortiaId());
@@ -968,6 +968,7 @@ public class WxServiceImpl implements WxService {
         orders.setFxyTwoArtificerDeductMoney(BigDecimal.ZERO);
         FxyConfig fc = fxyConfigService.getOne(new QueryWrapper<FxyConfig>());
         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<JjrConfig>());
                         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<JjrConfigLevel> list = jjrConfigServiceLevel.findList(null);
                                             for(int i=0;i<list.size();i++){
                                                 JjrConfigLevel jjrcl = list.get(i);
@@ -1718,7 +1719,7 @@ public class WxServiceImpl implements WxService {
                                 }
                             }
                         }
-                        UserEntity artificerUser = userService.selectUserById(artificer.getUserId());
+
                         BigDecimal shopMoney = BigDecimal.ZERO;
                         if (artificerUser.getConsortiaId() != null) {
                             Consortia consortia = consortiaService.getById(artificerUser.getConsortiaId());
@@ -1752,6 +1753,7 @@ public class WxServiceImpl implements WxService {
                         orders.setFxyTwoArtificerDeductMoney(BigDecimal.ZERO);
                         FxyConfig fc = fxyConfigService.getOne(new QueryWrapper<FxyConfig>());
                         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<JjrConfig>());
                                 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<JjrConfigLevel> list = jjrConfigServiceLevel.findList(null);
                                                     for(int i=0;i<list.size();i++){
                                                         JjrConfigLevel jjrcl = list.get(i);
@@ -2721,7 +2723,7 @@ public class WxServiceImpl implements WxService {
                                         }
                                     }
                                 }
-                                UserEntity artificerUser = userService.selectUserById(artificer.getUserId());
+
                                 BigDecimal shopMoney = BigDecimal.ZERO;
                                 if (artificerUser.getConsortiaId() != null) {
                                     Consortia consortia = consortiaService.getById(artificerUser.getConsortiaId());
@@ -2755,6 +2757,7 @@ public class WxServiceImpl implements WxService {
                                 orders.setFxyTwoArtificerDeductMoney(BigDecimal.ZERO);
                                 FxyConfig fc = fxyConfigService.getOne(new QueryWrapper<FxyConfig>());
                                 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());