From 9aa109735b29215f9a64426300095706fd137d0b Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 01 一月 2025 17:49:24 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java |    2 
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/CommissionServiceImpl.java    |   52 +++++++++++--------------
 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java   |    9 ++--
 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java      |    3 +
 4 files changed, 32 insertions(+), 34 deletions(-)

diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
index 8168bf8..35c5952 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
@@ -612,6 +612,9 @@
 
     @GetMapping("/listByIds")
     List<AppUser> listByIds(@RequestParam("ids") List<Long> ids) {
+        if(ids.size() == 0){
+            return new ArrayList<>();
+        }
         List<AppUser> appUsers = appUserService.listByIds(ids);
         return appUsers;
     }
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
index afae1bf..7920fbb 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
@@ -369,15 +369,16 @@
 				vipUpgrade(appUser.getId());
 			}
 			//拉新分佣
-			if(null != appUser2){
+			if(0 == old && null != appUser2){
+				pointSetting = pointSettingClient.getPointSetting(appUser2.getVipId()).getData();
 				Integer newPoint = pointSetting.getNewPoint();
 				Integer newPoint1 = 0;
-				if(1 == pointSetting.getGetRegisPointOpen()){
-					newPoint1 = new BigDecimal(newPoint).multiply(pointSetting.getGetRegisPoint().divide(new BigDecimal(100))).intValue();
+				if(1 == pointSetting.getGetNewPointOpen()){
+					newPoint1 = new BigDecimal(newPoint).multiply(pointSetting.getGetNewPoint().divide(new BigDecimal(100))).intValue();
 				}
 				appUser2.setLavePoint(appUser2.getLavePoint() + newPoint);
 				appUser2.setAvailablePoint(appUser2.getAvailablePoint() + newPoint1);
-				if(null != pointSetting && 1 == pointSetting.getGetRegisPointGift()){
+				if(null != pointSetting && 1 == pointSetting.getGetNewPointGift()){
 					appUser2.setTransferablePoint(appUser2.getTransferablePoint() + newPoint1);
 				}
 				appUser2.setTotalInvitePoint(appUser2.getTotalInvitePoint() + newPoint);
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java
index 100a04a..1230f20 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java
@@ -77,7 +77,7 @@
         List<UserPoint> userPointList = list(new LambdaQueryWrapper<UserPoint>()
                 .between(startTime != null, UserPoint::getCreateTime, startTime, endTime)
                 .eq(type != null, UserPoint::getType, type)
-                .eq(UserPoint::getAppUserId, userId));
+                .eq(UserPoint::getAppUserId, userId).orderByDesc(UserPoint::getCreateTime));
         if (CollectionUtil.isNotEmpty(userPointList)) {
             return userPointList.stream().map(p -> {
                 UserPointDetailVO userPointDetailVO = new UserPointDetailVO();
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 89e3779..ef55d38 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
@@ -8,6 +8,7 @@
 import com.ruoyi.account.api.model.BalanceChangeRecord;
 import com.ruoyi.account.api.model.UserPoint;
 import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.order.service.CommissionService;
 import com.ruoyi.order.service.OrderGoodService;
 import com.ruoyi.order.service.OrderService;
@@ -97,26 +98,30 @@
                 BigDecimal superiorSubcommission = orderGood.getSuperiorSubcommission();
                 //上级获得分佣积分(直推上级|直帮上级)
                 Integer superiorRebatePoints = orderGood.getSuperiorRebatePoints();
-                String[] split = orderGood.getSuperiorPriceType().split(",");
-                for (String s : split) {
-                    //直推上级
-                    if("1".equals(s)){
-                        ztsj_price = ztsj_price.add(superiorSubcommission);
-                    }
-                    //直帮上级
-                    if("2".equals(s)){
-                        zbsj_price = zbsj_price.add(superiorSubcommission);
+                if(StringUtils.isNotEmpty(orderGood.getSuperiorPriceType())){
+                    String[] split = orderGood.getSuperiorPriceType().split(",");
+                    for (String s : split) {
+                        //直推上级
+                        if("1".equals(s)){
+                            ztsj_price = ztsj_price.add(superiorSubcommission);
+                        }
+                        //直帮上级
+                        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;
+                if(StringUtils.isNotEmpty(orderGood.getSuperiorType())){
+                    String[] split = orderGood.getSuperiorType().split(",");
+                    for (String s : split) {
+                        //直推上级
+                        if("1".equals(s)){
+                            ztsj_point += superiorRebatePoints;
+                        }
+                        //直帮上级
+                        if("2".equals(s)){
+                            zbsj_point += superiorRebatePoints;
+                        }
                     }
                 }
                 
@@ -257,10 +262,6 @@
                 Integer lavePoint = shopAppUser.getLavePoint();
                 Integer shopLavePoint = shop.getLavePoint();
                 if(hxmd_price.compareTo(BigDecimal.ZERO) > 0){
-                    shopAppUser.setTotalDistributionAmount(shopAppUser.getTotalDistributionAmount().add(hxmd_price).setScale(2, BigDecimal.ROUND_HALF_EVEN));
-                    shopAppUser.setBalance(shopAppUser.getBalance().add(hxmd_price).setScale(2, BigDecimal.ROUND_HALF_EVEN));
-                    shopAppUser.setWithdrawableAmount(shopAppUser.getWithdrawableAmount().add(hxmd_price).setScale(2, BigDecimal.ROUND_HALF_EVEN));
-                    shopAppUser.setShopServiceFee(shopAppUser.getShopServiceFee().add(hxmd_price).setScale(2, BigDecimal.ROUND_HALF_EVEN));
                     //门店返佣
                     shop.setGiveawayAllMoney(shop.getGiveawayAllMoney().add(hxmd_price).setScale(2, BigDecimal.ROUND_HALF_EVEN));
                     shop.setServerGiveawayMoney(shop.getServerGiveawayMoney().add(hxmd_price).setScale(2, BigDecimal.ROUND_HALF_EVEN));
@@ -396,10 +397,6 @@
                     Integer lavePoint = bdShopAppUser.getLavePoint();
                     Integer shopLavePoint = shop1.getLavePoint();
                     if(bdmd_price.compareTo(BigDecimal.ZERO) > 0){
-                        bdShopAppUser.setTotalDistributionAmount(bdShopAppUser.getTotalDistributionAmount().add(bdmd_price).setScale(2, BigDecimal.ROUND_HALF_EVEN));
-                        bdShopAppUser.setBalance(bdShopAppUser.getBalance().add(bdmd_price).setScale(2, BigDecimal.ROUND_HALF_EVEN));
-                        bdShopAppUser.setWithdrawableAmount(bdShopAppUser.getWithdrawableAmount().add(bdmd_price).setScale(2, BigDecimal.ROUND_HALF_EVEN));
-                        bdShopAppUser.setShopCommission(bdShopAppUser.getShopCommission().add(bdmd_price).setScale(2, BigDecimal.ROUND_HALF_EVEN));
                         //门店返佣
                         shop1.setGiveawayAllMoney(shop1.getGiveawayAllMoney().add(bdmd_price).setScale(2, BigDecimal.ROUND_HALF_EVEN));
                         shop1.setGiveawayMoney(shop1.getGiveawayMoney().add(bdmd_price).setScale(2, BigDecimal.ROUND_HALF_EVEN));
@@ -497,9 +494,6 @@
                     Integer lavePoint = sjShopAppUser.getLavePoint();
                     Integer shopLavePoint = shop2.getLavePoint();
                     if(bdmdsj_price.compareTo(BigDecimal.ZERO) > 0){
-                        sjShopAppUser.setTotalDistributionAmount(sjShopAppUser.getTotalDistributionAmount().add(bdmdsj_price).setScale(2, BigDecimal.ROUND_HALF_EVEN));
-                        sjShopAppUser.setBalance(sjShopAppUser.getBalance().add(bdmdsj_price).setScale(2, BigDecimal.ROUND_HALF_EVEN));
-                        sjShopAppUser.setWithdrawableAmount(sjShopAppUser.getWithdrawableAmount().add(bdmdsj_price).setScale(2, BigDecimal.ROUND_HALF_EVEN));
                         //门店返佣
                         shop2.setGiveawayAllMoney(shop2.getGiveawayAllMoney().add(bdmdsj_price).setScale(2, BigDecimal.ROUND_HALF_EVEN));
                         shop2.setLowerLevelGiveawayMoney(shop2.getLowerLevelGiveawayMoney().add(bdmdsj_price).setScale(2, BigDecimal.ROUND_HALF_EVEN));

--
Gitblit v1.7.1