Browse Source

创建订单选择渠道时改为前端传其他

anderx 3 years ago
parent
commit
1a07670a91

+ 2 - 2
src/main/java/com/goafanti/common/task/ReleaseUserTask.java

@@ -51,8 +51,8 @@ public class ReleaseUserTask {
 	 *
 	 * @throws InterruptedException
 	 */
-//	@Scheduled(cron = "0 41 11  * * ?")
-	@Scheduled(cron = "0 0 1  * * ?")
+	@Scheduled(cron = "0 52 14  * * ?")
+//	@Scheduled(cron = "0 0 1  * * ?")
 	public void startTask() {
 		try {
 			pushUserDays();

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

@@ -2471,7 +2471,8 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 
 			throw new BusinessException("转换异常");
 		}
-		diff1 = (int) ((endLong + AFTConstants.USER_FOLLOW_LIMIT_MS - now.getTime()) / (24 * 3600 * 1000));
+		endLong=endLong+AFTConstants.USER_FOLLOW_LIMIT_MS;
+		diff1 = (int) ((endLong  - now.getTime()) / (24 * 3600 * 1000));
 		return diff1.toString();
 	}
 }

+ 9 - 3
src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java

@@ -63,9 +63,15 @@ public class AdminNewOrderApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","销售类型"));
 			return res;
 		}else{
-			if (salesType== salesTypes.qd.getCode()&&StringUtils.isBlank(channelId)){
-				res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","销售类型为渠道,渠道客户"));
-				return res;
+			if (salesType== salesTypes.qd.getCode()){
+				if (StringUtils.isBlank(channelId)){
+					res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","销售类型为渠道,渠道客户"));
+					return res;
+				}
+				if (StringUtils.isBlank(other)){
+					res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","销售类型为渠道,渠道客户名称"));
+					return res;
+				}
 			}
 			if ((salesType== salesTypes.qt.getCode()||salesType== salesTypes.zjs.getCode())
 					&&StringUtils.isBlank(other)){