From 0bb521469618b34464dff82cc14d2783804e600c Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Tue, 28 Oct 2025 14:03:43 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=91=E5=AE=9A=E4=B8=8A=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/MkDistributionUserServiceImpl.java   | 60 ++++++++++---------
 1 file changed, 31 insertions(+), 29 deletions(-)

diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java
index 7779db4d..ed0e7d8a 100644
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java
@@ -137,7 +137,7 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
                 }
             }
 //            else if("manual".equals(unActivate.getOpenType())){
-//                unActivate.setLabelContent("manual手动开通");
+//                unActivate.setLabelContent("manual手动开通");，
 //            }
 
         }
@@ -213,7 +213,9 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
     public void bindInviteUser(MkDistributionUserDTO param) {
         ShopUser shopUser = shopUserService.getById(param.getId());
         AssertUtil.isNull(shopUser, "店铺用户不存在");
-        AssertUtil.isNull(shopUser.getDistributionUserId(), "店铺用户已绑定分销员");
+        if(shopUser.getDistributionUserId() != null){
+            throw new CzgException("店铺用户已绑定分销员");
+        }
         MkDistributionUser parent = getOne(QueryWrapper.create().eq(MkDistributionUser::getInviteCode, param.getInviteCode()));
         AssertUtil.isNull(parent, "邀请人不存在");
         ShopUser newShopUser = new ShopUser();
@@ -245,33 +247,33 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
     }
 
 
-//    /**
-//     * 按消费金额升级等级
-//     *
-//     * @param distributionUserId 分销员Id
-//     */
-//    public void costUpgradeLevel(Long distributionUserId) {
-//        MkDistributionUser distributionUser = getById(distributionUserId);
-//        if (distributionUser == null) {
-//            return;
-//        }
-//
-//        MkDistributionConfig mkDistributionConfig = mkDistributionConfigService.getOne(QueryWrapper.create()
-//                .eq(MkDistributionConfig::getShopId, distributionUser.getShopId()));
-//        AssertUtil.isNull(mkDistributionConfig, "升级失败,店铺未配置分销");
-//        AssertUtil.isNotEqual(mkDistributionConfig.getUpgradeType(), "cost", "升级失败");
-//
-//        MkDistributionLevelConfig levelConfig = levelConfigService.getOne(QueryWrapper.create()
-//                .eq(MkDistributionLevelConfig::getShopId, distributionUser.getShopId())
-//                .le(MkDistributionLevelConfig::getInviteCount, distributionUser.getInviteCount())
-//                .gt(MkDistributionLevelConfig::getId, distributionUser.getDistributionLevelId())
-//                .orderBy(MkDistributionLevelConfig::getLevel).desc().limit(1));
-//        if (levelConfig != null) {
-//            distributionUser.setDistributionLevelId(levelConfig.getId());
-//            distributionUser.setDistributionLevelName(levelConfig.getName());
-//        }
-//
-//    }
+    /**
+     * 按消费金额升级等级
+     *
+     * @param distributionUserId 分销员Id
+     */
+    public void costUpgradeLevel(Long distributionUserId) {
+        MkDistributionUser distributionUser = getById(distributionUserId);
+        if (distributionUser == null) {
+            return;
+        }
+
+        MkDistributionConfig mkDistributionConfig = mkDistributionConfigService.getOne(QueryWrapper.create()
+                .eq(MkDistributionConfig::getShopId, distributionUser.getShopId()));
+        AssertUtil.isNull(mkDistributionConfig, "升级失败,店铺未配置分销");
+        AssertUtil.isNotEqual(mkDistributionConfig.getUpgradeType(), "cost", "升级失败");
+
+        MkDistributionLevelConfig levelConfig = levelConfigService.getOne(QueryWrapper.create()
+                .eq(MkDistributionLevelConfig::getShopId, distributionUser.getShopId())
+                .le(MkDistributionLevelConfig::getInviteCount, distributionUser.getInviteCount())
+                .gt(MkDistributionLevelConfig::getId, distributionUser.getDistributionLevelId())
+                .orderBy(MkDistributionLevelConfig::getLevel).desc().limit(1));
+        if (levelConfig != null) {
+            distributionUser.setDistributionLevelId(levelConfig.getId());
+            distributionUser.setDistributionLevelName(levelConfig.getName());
+        }
+
+    }
 
     @Override
     public Page<MkDistributionUserDTO> getDistributionUser(MkDistributionUserDTO param) {