Browse Source

项目其他BUG修复(领取提示、签单客户显示时间)

anderx 6 years ago
parent
commit
14e4c7addf

+ 3 - 1
src/main/java/com/goafanti/common/constant/AFTConstants.java

@@ -115,9 +115,11 @@ public class AFTConstants {
 	/** 转公共客户拜访时限 **/
 	public static final long USER_FOLLOW_LIMIT_MS					= 24*3600*1000*30L;
 	/** 转公公共客户签单时限 **/
-	public static final long USER_SIGN_LIMIT_MS						= 24*3600*1000*270L;
+	public static final long USER_SIGN_LIMIT_MS						= 24*3600*1000*360L;
 	
 	public static final Integer USER_STATUS = 1;
+	/** 领取员工上线 **/
+	public static final Integer USER_RCEIVE_MAX= 9;
 	
 	
 	public static final String DEFAULT_CONTACT_TYPE="0";

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

@@ -925,8 +925,8 @@ public class CustomerServiceImpl  extends BaseMybatisDao<UserMapper> implements
 			user.setTransferTime(now);
 			flag = addUserLock(uid,TokenManager.getAdminId(),now); //指定用户锁定客户
 			if(flag <= 0) throw new BusinessException(new Error(ErrorConstants.CUSTOMER_ALREADY_RECEIVE,""));
-			if(userMapper.UserReceiveCount(TokenManager.getAdminId())>9)
-			throw new BusinessException(new Error(ErrorConstants.CUSTOM_EREXCESS,""));
+			if(userMapper.UserReceiveCount(TokenManager.getAdminId())>AFTConstants.USER_RCEIVE_MAX)
+			throw new BusinessException(new Error(ErrorConstants.CUSTOM_EREXCESS,""+(AFTConstants.USER_RCEIVE_MAX+1),""));
 			organizationContactBookMapper.updateAdmin(uid,TokenManager.getAdminId());
 		}else if(operatorType.equals(AFTConstants.USER_TRANSFER_TO_OTHER)){
 			user.setAid(String.valueOf(params[0]));

+ 1 - 1
src/main/resources/props/error.properties

@@ -122,7 +122,7 @@ ORDER_ALREADY_REVOKE = \u8BE5\u8BA2\u5355\u5DF2\u7ECF\u5E9F\u9664{0}
 
 ORDER_NOT_EXIST = \u8BA2\u5355\u4E0D\u5B58\u5728{0}
 
-CUSTOM_EREXCESS= \u5ba2\u6237\u9886\u53d6\u8d85\u989d
+CUSTOM_EREXCESS= \u5ba2\u6237\u9886\u53d6\u8d85\u989d\u002c\u6bcf\u5929\u6700\u591a{0}\u4e2a
 
 PAY_BEYOND_SIGN = \u652F\u4ED8\u91D1\u989D\u8D85\u8FC7\u5408\u540C\u4EF7\u683C