Browse Source

Merge branch 'test'

anderx 3 years ago
parent
commit
3117a40e74

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

@@ -635,11 +635,18 @@ public class AdminCustomerApiController extends BaseApiController{
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, ""));
 			return res;
 		}
-
-		if (customerService.receiveEveryDay(uid)){
-			res.getError().add(buildError(ErrorConstants.CUSTOM_EREXCESS,  USER_RECEIVE_MAX.toString(),USER_RECEIVE_MAX.toString()));
-			return res;
-
+		Integer check =customerService.receiveEveryDay(uid);
+		if (check!=0){
+			if (check==-1){
+				res.getError().add(buildError(ErrorConstants.CUSTOMER_ALREADY_RECEIVE));
+				return res;
+			}else if (check==-2){
+				res.getError().add(buildError(ErrorConstants.CUSTOM_EREXCESS,  USER_RECEIVE_MAX.toString(),USER_RECEIVE_MAX.toString()));
+				return res;
+			}else {
+				res.getError().add(buildError("领取参数异常,请联系管理员"));
+				return res;
+			}
 		}
 		if (customerService.checkMax(uid,TokenManager.getAdminId())) {
 			res.getError().add(buildError("", "私有客户已达最大限制"));

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

@@ -544,7 +544,12 @@ public interface CustomerService {
 
     List<?> selectChannelUserList(InputChannelListBo in);
 
-	boolean receiveEveryDay(String uid);
+	/**
+	 *
+	 * @param uid
+	 * @return 0 正常 1 被其他人领取 2领取上限
+	 */
+	Integer receiveEveryDay(String uid);
 
     int pushReceiveAsChannel(String uid);
 }

+ 5 - 6
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -1196,8 +1196,6 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 			user.setTransferTime(now);
 			flag = addUserLock(uid, TokenManager.getAdminId(), now, uList); // 指定用户锁定客户
 			addUserTransferLog(uid, TokenManager.getAdminId(), null,1, null, now, uList);
-			if (flag <= 0)
-				throw new BusinessException(new Error(ErrorConstants.CUSTOMER_ALREADY_RECEIVE, ""));
 			updateUserMid(aid,uid,0,null);
 			organizationContactBookMapper.updateAdmin(uid,aid);
 			//转交
@@ -1260,13 +1258,14 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 	}
 
 	@Override
-	public boolean receiveEveryDay(String uid) {
+	public Integer receiveEveryDay(String uid) {
 		if (uid !=null ){
 			User u=userMapper.selectByPrimaryKey(uid);
-			if (u.getNewChannel()==1)return false;
+			if (u.getShareType()!=1)return -1;
+			if (u.getNewChannel()==1)return 0;
 		}
-		if (userMapper.UserReceiveCount(TokenManager.getAdminId()) >= USER_RECEIVE_MAX)return  true;
-		return false;
+		if (userMapper.UserReceiveCount(TokenManager.getAdminId()) >= USER_RECEIVE_MAX)return  -2;
+		return 0;
 	}
 
 	@Override