From 6b6190b57b2a10b1b21cd8ecfb57bfeb898b1c69 Mon Sep 17 00:00:00 2001
From: dd <gitluke@outlook.com>
Date: Fri, 26 Dec 2025 00:49:53 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/service/impl/AgentUserServiceImpl.java |   25 +++++++++++++++++--------
 1 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/AgentUserServiceImpl.java b/src/main/java/com/nq/service/impl/AgentUserServiceImpl.java
index 0c1eab6..27ac06c 100644
--- a/src/main/java/com/nq/service/impl/AgentUserServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/AgentUserServiceImpl.java
@@ -1,5 +1,6 @@
 package com.nq.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -22,6 +23,7 @@
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
@@ -198,12 +200,16 @@
         AgentUser parentAgent = this.agentUserMapper.selectByPrimaryKey(parentId);
         if (parentId != null && parentId>0) {
             if (parentAgent != null) {
-                if(parentAgent.getAgentLevel()>=6){
-                    return ServerResponse.createByErrorMsg("六级代理不能添加下级");
-                }
                 agentUser.setParentId(parentAgent.getId());
                 agentUser.setParentName(parentAgent.getAgentName());
                 agentUser.setAgentLevel(parentAgent.getAgentLevel()+1);
+                //判断代理等级
+                StockConfig stockConfig = iStockConfigServices.queryByKey(EConfigKey.AGENT_MAX_GRADE.getCode());
+                Integer configLevel = Integer.parseInt(stockConfig.getCValue());
+                if(agentUser.getAgentLevel() > configLevel){
+                    return ServerResponse.createByErrorMsg("代理最大等级为"+stockConfig.getCValue());
+                }
+
             } else {
                 //总代理默认0级
                 agentUser.setAgentLevel(Integer.valueOf(0));
@@ -331,12 +337,13 @@
             if (parentAgent != null) {
                 dbAgent.setParentId(parentAgent.getId());
                 dbAgent.setParentName(parentAgent.getAgentName());
+                dbAgent.setAgentLevel(parentAgent.getAgentLevel()+1);
                 //判断代理等级
                 StockConfig stockConfig = iStockConfigServices.queryByKey(EConfigKey.AGENT_MAX_GRADE.getCode());
-                if(parentAgent.getAgentLevel()+1 > Integer.parseInt(stockConfig.getCValue())){
+                if(dbAgent.getAgentLevel() > Integer.parseInt(stockConfig.getCValue())){
                     return ServerResponse.createByErrorMsg("代理最大等级为"+stockConfig.getCValue());
                 }
-                dbAgent.setAgentLevel(parentAgent.getAgentLevel()+1);
+
             } else {
                 //总代理默认0级
                 dbAgent.setAgentLevel(Integer.valueOf(0));
@@ -377,9 +384,11 @@
             dbAgent.setSiteLever(agentUser.getSiteLever());
         }
         if (StringUtils.isNotBlank(agentUser.getAgentPhone())) {
-            AgentUser phoneAgent = this.agentUserMapper.findByPhone(agentUser.getAgentPhone());
-
-            if (phoneAgent == null || phoneAgent.getId() == agentUser.getId()) {
+            Long count = agentUserMapper.selectCount(new LambdaQueryWrapper<AgentUser>()
+                    .eq(AgentUser::getAgentPhone, agentUser.getAgentPhone())
+                    .ne(AgentUser::getId, agentUser.getId())
+            );
+            if (count == 0) {
                 dbAgent.setAgentPhone(agentUser.getAgentPhone());
             } else {
                 return ServerResponse.createByErrorMsg("手机号已存在,请更换手机");

--
Gitblit v1.9.3