Bladeren bron

客户更名新增允许更换曾经更换的名字

anderx 1 jaar geleden
bovenliggende
commit
7686a09cfd

+ 4 - 5
src/main/java/com/goafanti/common/dao/UserNamesMapper.java

@@ -1,12 +1,11 @@
 package com.goafanti.common.dao;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-
 import com.goafanti.common.model.UserNames;
 import com.goafanti.customer.bo.UserNamesListBo;
 import com.goafanti.user.bo.InputUserChannel;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface UserNamesMapper {
     /**
@@ -61,7 +60,7 @@ public interface UserNamesMapper {
 
 	int updateAddUserName(@Param("uid") String uid, @Param("userName")String userName);
 
-	int checkUserName(String userName);
+    List<UserNamesListBo> checkUserName( @Param("userName")String userName);
 
 	void insertBatch(List<InputUserChannel> list);
 }

+ 3 - 2
src/main/java/com/goafanti/common/mapper/UserNamesMapper.xml

@@ -140,8 +140,9 @@
 	where a.uid = #{uid}
 	order by a.create_time 
   </select>
-  <select id="checkUserName" resultType="java.lang.Integer">
-  select count(*) from user_names where name= #{userName}
+  <select id="checkUserName" resultType="com.goafanti.customer.bo.UserNamesListBo">
+    select id,uid,aid,name ,date_format(create_time,'%Y-%m-%d %H:%i:%S') createTimes
+    from user_names where name= #{userName}
   </select>
   
   <insert id="insertBatch" parameterType="com.goafanti.user.bo.InputUserChannel">

+ 3 - 3
src/main/java/com/goafanti/customer/controller/AdminCustomerApiController.java

@@ -354,7 +354,7 @@ public class AdminCustomerApiController extends BaseApiController{
 					ParamUtils.getParamName(in,bindingResult.getFieldError().getField())));
 			return res;
 		}
-		if (customerService.checkUserName(in.getName())){
+		if (customerService.checkUserName(null,in.getName())){
 			res.getError().add(buildError("客户名称已存在"));
 			return res;
 		}
@@ -1480,7 +1480,7 @@ public class AdminCustomerApiController extends BaseApiController{
 		if (userName!=null){
 			userName=userName.trim();
 		}
-		if(customerService.checkUserName(userName)){
+		if(customerService.checkUserName(uid,userName)){
 			res.getError().add(buildError(ErrorConstants.CUSTOMER_ALREADY_EXIST,null,"["+userName+"]"));
 			return res;
 		}
@@ -1490,7 +1490,7 @@ public class AdminCustomerApiController extends BaseApiController{
 	@RequestMapping(value = "/checkUserName",method = RequestMethod.GET)
 	public Result checkUserName(String userName){
 		Result res =new Result();
-		res.data(customerService.checkUserName(userName));
+		res.data(customerService.checkUserName(null,userName));
 		return res;
 	}
 

+ 1 - 1
src/main/java/com/goafanti/customer/service/CustomerService.java

@@ -526,7 +526,7 @@ public interface CustomerService {
 	Object listChannelCounts(InputChannelCounts in);
 	int updateUserName(String uid, String userName);
 	List<UserNamesListBo> listUserName(String uid);
-	boolean checkUserName(String userName);
+	boolean checkUserName(String uid,String userName);
 	Object getUserByNames(String name,Integer type, Integer pageNo, Integer pageSize);
 
 	Pagination<OutUserMianProducts> mainProductsList(InputMainProductsList in) ;

+ 15 - 8
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -2753,21 +2753,28 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 	}
 
 	@Override
-	public boolean checkUserName(String userName) {
+	public boolean checkUserName(String uid,String userName) {
 		String name2=null;
 		if (userName.contains("(")){
 			name2=userName.replace("(","(").replace(")",")");
 		}else if (userName.contains("(")){
 			name2=userName.replace("(","(").replace(")",")");
 		}
-		int i=userNamesMapper.checkUserName(userName);
-		i+=userNamesMapper.checkUserName(name2);
-
-		if (i>0) {
-			return true;
+		List<UserNamesListBo> list=userNamesMapper.checkUserName(userName);
+		List<UserNamesListBo> list2=userNamesMapper.checkUserName(name2);
+		int i=0;
+		for (UserNamesListBo userNamesListBo : list) {
+			if (!userNamesListBo.getUid().equals(uid)){
+				i++;
+			}
 		}
-		return false;
-	}
+		for (UserNamesListBo userNamesListBo : list2) {
+			if (!userNamesListBo.getUid().equals(uid)){
+				i++;
+			}
+		}
+        return i > 0;
+    }
 
 	@Override
 	public List<UserNamesListBo> listUserName(String uid) {