From 56d62d9edb0dda9ae678dcea2323144db5d11c22 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 28 十二月 2024 18:06:58 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/CommissionServiceImpl.java |   29 +++++++++++++++++++++++++----
 1 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/CommissionServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/CommissionServiceImpl.java
index 8357e1e..f63d39d 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/CommissionServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/CommissionServiceImpl.java
@@ -102,11 +102,20 @@
                     //直推上级
                     if("1".equals(s)){
                         ztsj_price = ztsj_price.add(superiorSubcommission);
-                        ztsj_point += superiorRebatePoints;
                     }
                     //直帮上级
                     if("2".equals(s)){
                         zbsj_price = zbsj_price.add(superiorSubcommission);
+                    }
+                }
+                split = orderGood.getSuperiorType().split(",");
+                for (String s : split) {
+                    //直推上级
+                    if("1".equals(s)){
+                        ztsj_point += superiorRebatePoints;
+                    }
+                    //直帮上级
+                    if("2".equals(s)){
                         zbsj_point += superiorRebatePoints;
                     }
                 }
@@ -176,6 +185,8 @@
                     userPoint.setObjectId(order.getId());
                     userPoint.setExtention(order.getOrderNumber());
                     userPointClient.saveUserPoint(userPoint);
+                    //变更等级
+                    appUserClient.vipUpgrade(inviteUser.getId());
                 }
             }
             //直帮上级
@@ -226,6 +237,8 @@
                     userPoint.setObjectId(order.getId());
                     userPoint.setExtention(order.getOrderNumber());
                     userPointClient.saveUserPoint(userPoint);
+                    //变更等级
+                    appUserClient.vipUpgrade(superiorLeader.getId());
                 }
             }
     
@@ -258,7 +271,7 @@
                     shopAppUser.setLavePoint(shopAppUser.getLavePoint() + hxmd_point);
                     shopAppUser.setAvailablePoint(shopAppUser.getAvailablePoint() + earnPoint1);
                     shopAppUser.setTotalPoint(shopAppUser.getTotalPoint() + hxmd_point);
-                    shopAppUser.setShopAchievementPoint(shopAppUser.getShopAchievementPoint() + bdmdsj_point);
+                    shopAppUser.setShopAchievementPoint(shopAppUser.getShopAchievementPoint() + hxmd_point);
                     //门店返佣
                     shop.setShopAllPoint(shop.getShopAllPoint() + hxmd_point);
                     shop.setServerPoint(shop.getServerPoint() + hxmd_point);
@@ -305,6 +318,8 @@
                     userPoint.setObjectId(order.getId());
                     userPoint.setExtention(order.getOrderNumber());
                     userPointClient.saveUserPoint(userPoint);
+                    //变更等级
+                    appUserClient.vipUpgrade(shopAppUser.getId());
                 }
     
                 if(!shop.getLavePoint().equals(shopLavePoint)){
@@ -353,6 +368,8 @@
                         userPoint.setObjectId(order.getId());
                         userPoint.setExtention(order.getOrderNumber());
                         userPointClient.saveUserPoint(userPoint);
+                        //变更等级
+                        appUserClient.vipUpgrade(technicianAppUser.getId());
                     }
                 }
             }
@@ -387,7 +404,7 @@
                         bdShopAppUser.setLavePoint(bdShopAppUser.getLavePoint() + bdmd_point);
                         bdShopAppUser.setAvailablePoint(bdShopAppUser.getAvailablePoint() + earnPoint1);
                         bdShopAppUser.setTotalPoint(bdShopAppUser.getTotalPoint() + bdmd_point);
-                        bdShopAppUser.setShopSharePoint(bdShopAppUser.getShopSharePoint() + bdmdsj_point);
+                        bdShopAppUser.setShopSharePoint(bdShopAppUser.getShopSharePoint() + bdmd_point);
                         //门店返佣
                         shop1.setShopAllPoint(shop1.getShopAllPoint() + bdmd_point);
                         shop1.setSharePoint(shop1.getSharePoint() + bdmd_point);
@@ -434,6 +451,8 @@
                         userPoint.setObjectId(order.getId());
                         userPoint.setExtention(order.getOrderNumber());
                         userPointClient.saveUserPoint(userPoint);
+                        //变更等级
+                        appUserClient.vipUpgrade(bdShopAppUser.getId());
                     }
         
                     if(!shop1.getLavePoint().equals(shopLavePoint)){
@@ -453,7 +472,7 @@
             }
     
             //上级门店分佣
-            Integer pid = shopClient.getShopById(order.getShopId()).getData().getPid();
+            Integer pid = shop1.getPid();
             Shop shop2 = shopClient.getShopById(pid).getData();
             if(null != shop2){
                 AppUser sjShopAppUser = appUserClient.getAppUserById(shop2.getAppUserId());
@@ -529,6 +548,8 @@
                         userPoint.setObjectId(order.getId());
                         userPoint.setExtention(order.getOrderNumber());
                         userPointClient.saveUserPoint(userPoint);
+                        //变更等级
+                        appUserClient.vipUpgrade(sjShopAppUser.getId());
                     }
         
                     if(!shop2.getLavePoint().equals(shopLavePoint)){

--
Gitblit v1.7.1