Browse Source

update

Signed-off-by: anderx <anderx@qq.com>
anderx 5 years ago
parent
commit
aab0ff4f40

+ 11 - 6
src/main/java/com/goafanti/common/constant/AFTConstants.java

@@ -118,14 +118,19 @@ public class AFTConstants {
 
 	public static final Integer	USER_STATUS_LOCKING					= 2;
 
-	public static final String	USER_TRANSFER_TO_PUBLIC				= "转为公共客户";
+	/** 释放客户*/
+	public static final Integer	USER_TRANSFER_TO_PUBLIC				= 0;
 
-	public static final String	USER_DELETE							= "删除客户";
+	/** 删除客户*/
+	public static final Integer	USER_DELETE							= 1;
 	/** 领取*/
-	public static final String	USER_RECEIVE						= "领取";
-
-	/** 转交*/
-	public static final String	USER_TRANSFER_TO_OTHER				= "转交客户给制定人";
+	public static final Integer	USER_RECEIVE						= 2;
+	/** 私有转交*/
+	public static final Integer	USER_TRANSFER_TO_OTHER				= 3;
+	/** 签单转交*/
+	public static final Integer	SIGN_USER_TRANSFER_TO_OTHER				= 4;
+	
+	
 	
 	public static final String	PROJECT_TRANSFER_TO_OTHER				= "转交客户给制定人";
 

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

@@ -542,18 +542,6 @@ public class AdminCustomerApiController extends BaseApiController{
 		customerService.updateByOperatorType(uid, oldAid,AFTConstants.USER_RECEIVE);
 		return res;
 	}
-
-	/** 删除客户 **/
-	@RequestMapping(value = "/deleteCustomer", method = RequestMethod.GET)
-	public Result deleteCustomer(String uid,String oldAid){
-		Result res = new Result();
-		if(StringUtils.isBlank(uid) || StringUtils.isBlank("aid")){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, ""));
-			return res;
-		}
-		customerService.updateByOperatorType(uid, oldAid,AFTConstants.USER_DELETE);
-		return res;
-	}
 	
 	/**
 	 * 上传excel文档
@@ -767,7 +755,7 @@ public class AdminCustomerApiController extends BaseApiController{
 	
 	/** 转交客户到制定人 **/
 	@RequestMapping(value = "/transferToOther", method = RequestMethod.GET)
-	public Result transferToOther(String uid,String aid,String oldAid){
+	public Result transferToOther(String uid,String aid,Integer operatorType,String oldAid){
 		Result res = new Result();
 		if(StringUtils.isBlank(uid) || StringUtils.isBlank(aid)){
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "客户编号或管理员编号"));
@@ -777,7 +765,11 @@ public class AdminCustomerApiController extends BaseApiController{
 			res.getError().add(buildError("","对方私有客户已达最大限制"));
 			return res;
 		}
-		customerService.updateByOperatorType(uid,oldAid,AFTConstants.USER_TRANSFER_TO_OTHER, aid);
+		//默认为私有转交,4为签单转交
+		if (operatorType==null) {
+			operatorType=AFTConstants.USER_TRANSFER_TO_OTHER;
+		}
+		customerService.updateByOperatorType(uid,oldAid,operatorType, aid);
 		return res;
 	}
 	
@@ -1149,7 +1141,6 @@ public class AdminCustomerApiController extends BaseApiController{
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"用户ID错误","用户ID"));
 			return res;
 		}
-		
 		res.data(customerService.pushReleaseUser(id));
 		return res;
 	}

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

@@ -262,7 +262,7 @@ public interface CustomerService {
 	 * @param operatorType
 	 * @return
 	 */
-	int updateByOperatorType(String uid,String aid,String operatorType,Object... params);
+	int updateByOperatorType(String uid,String aid,Integer operatorType,Object... params);
 	
 	/**
 	 * 客户统计

+ 32 - 7
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -1002,7 +1002,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 	}
 
 	@Override
-	public int updateByOperatorType(String uid,String oldAid, String operatorType,Object... params) {
+	public int updateByOperatorType(String uid,String oldAid, Integer operatorType,Object... params) {
 		User user = new User();
 		Date now = new Date();
 		//是否多个客户
@@ -1016,7 +1016,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		}
 		user.setId(uid);
 		int flag = 0;
-		if(operatorType.equals(AFTConstants.USER_RECEIVE)){
+		if(AFTConstants.USER_RECEIVE.equals(operatorType)){
 			if(userMapper.UserReceiveCount(TokenManager.getAdminId())>=USER_RECEIVE_MAX)
 				throw new BusinessException(new Error(ErrorConstants.CUSTOM_EREXCESS,""+USER_RECEIVE_MAX,""));
 			user.setAid(TokenManager.getAdminId());
@@ -1028,12 +1028,13 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 			if(flag <= 0) throw new BusinessException(new Error(ErrorConstants.CUSTOMER_ALREADY_RECEIVE,""));
 			//取消客户领取时把联系人一并转移
 			//organizationContactBookMapper.updateAdmin(uid,TokenManager.getAdminId());
-		}else if(operatorType.equals(AFTConstants.USER_TRANSFER_TO_OTHER)){
+		}else if(AFTConstants.USER_TRANSFER_TO_OTHER.equals(operatorType)){
 			if(!isUs) {
 				user.setAid(String.valueOf(params[0]));
 				user.setSource(3);//客户来源设置为转交
-//				转换不重置时间
-//				user.setTransferTime(now);
+				if (AFTConstants.SIGN_USER_TRANSFER_TO_OTHER==operatorType) {
+					user.setShareType(2);
+				}
 				//查询这个客户是否是登陆人的客户
 				if(userMapper.getAidAndUser(uid,TokenManager.getAdminId())<=0)throw new BusinessException(new Error("请勿非法操作!","请勿非法操作!"));
 				flag = updateUserLock(uid,oldAid,UserLockReleaseStatus.LOCKED.getCode(),UserLockReleaseStatus.RELEASE.getCode()); //原用户释放客户
@@ -1049,9 +1050,33 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 				if(flag <= 0) throw new BusinessException(new Error(ErrorConstants.CUSTOMER_TRANSFER_FAIL,""));
 				addtransferLog(uid,null,TokenManager.getAdminId(),String.valueOf(params[0]),0,isUs);
 			}
+		}else if(AFTConstants.SIGN_USER_TRANSFER_TO_OTHER.equals(operatorType)){
+			if(!isUs) {
+				user.setAid(String.valueOf(params[0]));
+				user.setSource(3);//客户来源设置为转交
+				if (AFTConstants.SIGN_USER_TRANSFER_TO_OTHER==operatorType) {
+					user.setShareType(2);
+				}
+				//查询这个客户是否是登陆人的客户
+				if(userMapper.getAidAndUser(uid,TokenManager.getAdminId())<=0)throw new BusinessException(new Error("请勿非法操作!","请勿非法操作!"));
+				addtransferLog(uid,null,TokenManager.getAdminId(),String.valueOf(params[0]),0,isUs);
+			}else {
+				for (String us : uList) {
+					if(userMapper.getAidAndUser(us,TokenManager.getAdminId())<=0)throw new BusinessException(new Error("请勿非法操作!","请勿非法操作!"));
+				}
+				addtransferLog(uid,null,TokenManager.getAdminId(),String.valueOf(params[0]),0,isUs);
+			}
+			
+		}
+		if (isUs) {
+			if (AFTConstants.SIGN_USER_TRANSFER_TO_OTHER==operatorType) {
+				userMapper.updateList(String.valueOf(params[0]),null,3,null,2,uList);
+			} else {
+				userMapper.updateList(String.valueOf(params[0]),null,3,null,null,uList);
+			}
+		} else {
+			userMapper.updateByPrimaryKeySelective(user);
 		}
-		if (isUs)  userMapper.updateList(String.valueOf(params[0]),null,3,null,null,uList);
-		else userMapper.updateByPrimaryKeySelective(user);
 		return 1; 
 	}