Commit 1d597403c914944672676959a4a74df98486fa76

Authored by puhui999
1 parent 6ffb4ed1

【缺陷修复】商城:绑定分享人失败记录 log error 日志, 前端不提示错误信息

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; @@ -29,6 +29,7 @@ import cn.iocoder.yudao.module.trade.enums.brokerage.BrokerageRecordStatusEnum;
29 import cn.iocoder.yudao.module.trade.service.config.TradeConfigService; 29 import cn.iocoder.yudao.module.trade.service.config.TradeConfigService;
30 import com.baomidou.mybatisplus.core.metadata.IPage; 30 import com.baomidou.mybatisplus.core.metadata.IPage;
31 import jakarta.annotation.Resource; 31 import jakarta.annotation.Resource;
  32 +import lombok.extern.slf4j.Slf4j;
32 import org.springframework.stereotype.Service; 33 import org.springframework.stereotype.Service;
33 import org.springframework.transaction.annotation.Transactional; 34 import org.springframework.transaction.annotation.Transactional;
34 import org.springframework.validation.annotation.Validated; 35 import org.springframework.validation.annotation.Validated;
@@ -45,6 +46,7 @@ import static cn.iocoder.yudao.module.trade.enums.ErrorCodeConstants.*; @@ -45,6 +46,7 @@ import static cn.iocoder.yudao.module.trade.enums.ErrorCodeConstants.*;
45 * 46 *
46 * @author owen 47 * @author owen
47 */ 48 */
  49 +@Slf4j
48 @Service 50 @Service
49 @Validated 51 @Validated
50 public class BrokerageUserServiceImpl implements BrokerageUserService { 52 public class BrokerageUserServiceImpl implements BrokerageUserService {
@@ -174,34 +176,39 @@ public class BrokerageUserServiceImpl implements BrokerageUserService { @@ -174,34 +176,39 @@ public class BrokerageUserServiceImpl implements BrokerageUserService {
174 176
175 @Override 177 @Override
176 public boolean bindBrokerageUser(Long userId, Long bindUserId) { 178 public boolean bindBrokerageUser(Long userId, Long bindUserId) {
177 - // 1. 获得分销用户  
178 - boolean isNewBrokerageUser = false;  
179 - BrokerageUserDO brokerageUser = brokerageUserMapper.selectById(userId);  
180 - if (brokerageUser == null) { // 分销用户不存在的情况:1. 新注册;2. 旧数据;3. 分销功能关闭后又打开  
181 - isNewBrokerageUser = true;  
182 - brokerageUser = new BrokerageUserDO().setId(userId).setBrokerageEnabled(false).setBrokeragePrice(0).setFrozenPrice(0);  
183 - } 179 + try {
  180 + // 1. 获得分销用户
  181 + boolean isNewBrokerageUser = false;
  182 + BrokerageUserDO brokerageUser = brokerageUserMapper.selectById(userId);
  183 + if (brokerageUser == null) { // 分销用户不存在的情况:1. 新注册;2. 旧数据;3. 分销功能关闭后又打开
  184 + isNewBrokerageUser = true;
  185 + brokerageUser = new BrokerageUserDO().setId(userId).setBrokerageEnabled(false).setBrokeragePrice(0).setFrozenPrice(0);
  186 + }
184 187
185 - // 2.1 校验是否能绑定用户  
186 - boolean validated = isUserCanBind(brokerageUser);  
187 - if (!validated) {  
188 - return false;  
189 - }  
190 - // 2.3 校验能否绑定  
191 - validateCanBindUser(brokerageUser, bindUserId);  
192 - // 2.3 绑定用户  
193 - if (isNewBrokerageUser) {  
194 - Integer enabledCondition = tradeConfigService.getTradeConfig().getBrokerageEnabledCondition();  
195 - if (BrokerageEnabledConditionEnum.ALL.getCondition().equals(enabledCondition)) { // 人人分销:用户默认就有分销资格  
196 - brokerageUser.setBrokerageEnabled(true).setBrokerageTime(LocalDateTime.now()); 188 + // 2.1 校验是否能绑定用户
  189 + boolean validated = isUserCanBind(brokerageUser);
  190 + if (!validated) {
  191 + return false;
  192 + }
  193 + // 2.3 校验能否绑定
  194 + validateCanBindUser(brokerageUser, bindUserId);
  195 + // 2.3 绑定用户
  196 + if (isNewBrokerageUser) {
  197 + Integer enabledCondition = tradeConfigService.getTradeConfig().getBrokerageEnabledCondition();
  198 + if (BrokerageEnabledConditionEnum.ALL.getCondition().equals(enabledCondition)) { // 人人分销:用户默认就有分销资格
  199 + brokerageUser.setBrokerageEnabled(true).setBrokerageTime(LocalDateTime.now());
  200 + } else {
  201 + brokerageUser.setBrokerageEnabled(false).setBrokerageTime(LocalDateTime.now());
  202 + }
  203 + brokerageUserMapper.insert(fillBindUserData(bindUserId, brokerageUser));
197 } else { 204 } else {
198 - brokerageUser.setBrokerageEnabled(false).setBrokerageTime(LocalDateTime.now()); 205 + brokerageUserMapper.updateById(fillBindUserData(bindUserId, new BrokerageUserDO().setId(userId)));
199 } 206 }
200 - brokerageUserMapper.insert(fillBindUserData(bindUserId, brokerageUser));  
201 - } else {  
202 - brokerageUserMapper.updateById(fillBindUserData(bindUserId, new BrokerageUserDO().setId(userId))); 207 + return true;
  208 + } catch (Exception e) {
  209 + log.error("[bindBrokerageUser][userId({}) 绑定推广员失败 bindUserId({})]", userId, bindUserId, e);
  210 + return false;
203 } 211 }
204 - return true;  
205 } 212 }
206 213
207 @Override 214 @Override