Browse Source

公出汇总新增合同等字段

anderx 3 years ago
parent
commit
26050356d7

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

@@ -643,21 +643,17 @@ public class AdminCustomerApiController extends BaseApiController{
 			}else if (check==-2){
 				res.getError().add(buildError(ErrorConstants.CUSTOM_EREXCESS,  USER_RECEIVE_MAX.toString(),USER_RECEIVE_MAX.toString()));
 				return res;
+			}else if (check==-3){
+				res.getError().add(buildError("", "私有客户已达最大限制"));
+				return res;
+			}else if (check==-4){
+				res.getError().add(buildError("", "外联客户丢失后不可再领取"));
+				return res;
 			}else {
 				res.getError().add(buildError("领取参数异常,请联系管理员"));
 				return res;
 			}
 		}
-		if (customerService.checkMax(uid,TokenManager.getAdminId())) {
-			res.getError().add(buildError("", "私有客户已达最大限制"));
-			return res;
-		}
-
-		if (customerService.checkBeforeChannel(uid)) {
-			res.getError().add(buildError("", "外联客户丢失后不可再领取"));
-			return res;
-		}
-
 		customerService.updateByOperatorType(uid, null, oldAid, AFTConstants.USER_RECEIVE, null);
 		return res;
 	}

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

@@ -1285,8 +1285,15 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 			User u=userMapper.selectByPrimaryKey(uid);
 			if (u.getShareType()!=1)return -1;
 			if (u.getNewChannel()==1)return 0;
+
 		}
 		if (userMapper.UserReceiveCount(TokenManager.getAdminId()) >= USER_RECEIVE_MAX)return  -2;
+		if(checkMax(uid,TokenManager.getAdminId())){
+			return -3;
+		}
+		if(checkBeforeChannel(uid)){
+			return -4;
+		}
 		return 0;
 	}