Procházet zdrojové kódy

Merge branch 'test2' of jishutao/kede-server into prod

anderx před 1 rokem
rodič
revize
a45c854584

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

@@ -668,6 +668,9 @@ public class AdminCustomerApiController extends BaseApiController{
 			}else if (check==-4){
 				res.getError().add(buildError("", "外联客户丢失后不可再领取"));
 				return res;
+			}else if (check==-5){
+				res.getError().add(buildError("", "提示:不可领取!!!当前客户,他人外呼中。"));
+				return res;
 			}else {
 				res.getError().add(buildError("领取参数异常,请联系管理员"));
 				return res;

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

@@ -1592,6 +1592,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 			signBills = u.getSignBills();
 			if (u.getShareType()!=1)return -1;
 			if (u.getNewChannel()==1)return 0;
+			if (u.getCallStatus()==1)return -5;
 		}
 		int privateCount = userMapper.UserReceiveCount(TokenManager.getAdminId());
 		if (privateCount >= USER_RECEIVE_MAX)return  -2;