From 1d597403c914944672676959a4a74df98486fa76 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Tue, 7 Jan 2025 11:05:38 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=BC=BA=E9=99=B7=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E3=80=91=E5=95=86=E5=9F=8E=EF=BC=9A=E7=BB=91=E5=AE=9A=E5=88=86?=
 =?UTF-8?q?=E4=BA=AB=E4=BA=BA=E5=A4=B1=E8=B4=A5=E8=AE=B0=E5=BD=95=20log=20?=
 =?UTF-8?q?error=20=E6=97=A5=E5=BF=97,=20=E5=89=8D=E7=AB=AF=E4=B8=8D?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../brokerage/BrokerageUserServiceImpl.java   | 57 +++++++++++--------
 1 file changed, 32 insertions(+), 25 deletions(-)

diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserServiceImpl.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserServiceImpl.java
index 490f2cec8c..921915ea96 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserServiceImpl.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserServiceImpl.java
@@ -29,6 +29,7 @@ import cn.iocoder.yudao.module.trade.enums.brokerage.BrokerageRecordStatusEnum;
 import cn.iocoder.yudao.module.trade.service.config.TradeConfigService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
@@ -45,6 +46,7 @@ import static cn.iocoder.yudao.module.trade.enums.ErrorCodeConstants.*;
  *
  * @author owen
  */
+@Slf4j
 @Service
 @Validated
 public class BrokerageUserServiceImpl implements BrokerageUserService {
@@ -174,34 +176,39 @@ public class BrokerageUserServiceImpl implements BrokerageUserService {
 
     @Override
     public boolean bindBrokerageUser(Long userId, Long bindUserId) {
-        // 1. 获得分销用户
-        boolean isNewBrokerageUser = false;
-        BrokerageUserDO brokerageUser = brokerageUserMapper.selectById(userId);
-        if (brokerageUser == null) { // 分销用户不存在的情况：1. 新注册；2. 旧数据；3. 分销功能关闭后又打开
-            isNewBrokerageUser = true;
-            brokerageUser = new BrokerageUserDO().setId(userId).setBrokerageEnabled(false).setBrokeragePrice(0).setFrozenPrice(0);
-        }
+        try {
+            // 1. 获得分销用户
+            boolean isNewBrokerageUser = false;
+            BrokerageUserDO brokerageUser = brokerageUserMapper.selectById(userId);
+            if (brokerageUser == null) { // 分销用户不存在的情况：1. 新注册；2. 旧数据；3. 分销功能关闭后又打开
+                isNewBrokerageUser = true;
+                brokerageUser = new BrokerageUserDO().setId(userId).setBrokerageEnabled(false).setBrokeragePrice(0).setFrozenPrice(0);
+            }
 
-        // 2.1 校验是否能绑定用户
-        boolean validated = isUserCanBind(brokerageUser);
-        if (!validated) {
+            // 2.1 校验是否能绑定用户
+            boolean validated = isUserCanBind(brokerageUser);
+            if (!validated) {
+                return false;
+            }
+            // 2.3 校验能否绑定
+            validateCanBindUser(brokerageUser, bindUserId);
+            // 2.3 绑定用户
+            if (isNewBrokerageUser) {
+                Integer enabledCondition = tradeConfigService.getTradeConfig().getBrokerageEnabledCondition();
+                if (BrokerageEnabledConditionEnum.ALL.getCondition().equals(enabledCondition)) { // 人人分销：用户默认就有分销资格
+                    brokerageUser.setBrokerageEnabled(true).setBrokerageTime(LocalDateTime.now());
+                } else {
+                    brokerageUser.setBrokerageEnabled(false).setBrokerageTime(LocalDateTime.now());
+                }
+                brokerageUserMapper.insert(fillBindUserData(bindUserId, brokerageUser));
+            } else {
+                brokerageUserMapper.updateById(fillBindUserData(bindUserId, new BrokerageUserDO().setId(userId)));
+            }
+            return true;
+        } catch (Exception e) {
+            log.error("[bindBrokerageUser][userId({}) 绑定推广员失败 bindUserId({})]", userId, bindUserId, e);
             return false;
         }
-        // 2.3 校验能否绑定
-        validateCanBindUser(brokerageUser, bindUserId);
-        // 2.3 绑定用户
-        if (isNewBrokerageUser) {
-            Integer enabledCondition = tradeConfigService.getTradeConfig().getBrokerageEnabledCondition();
-            if (BrokerageEnabledConditionEnum.ALL.getCondition().equals(enabledCondition)) { // 人人分销：用户默认就有分销资格
-                brokerageUser.setBrokerageEnabled(true).setBrokerageTime(LocalDateTime.now());
-            } else {
-                brokerageUser.setBrokerageEnabled(false).setBrokerageTime(LocalDateTime.now());
-            }
-            brokerageUserMapper.insert(fillBindUserData(bindUserId, brokerageUser));
-        } else {
-            brokerageUserMapper.updateById(fillBindUserData(bindUserId, new BrokerageUserDO().setId(userId)));
-        }
-        return true;
     }
 
     @Override