Merge branch 'cygx/need_1035' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/company.go

@@ -2743,22 +2743,6 @@ func (this *CompanyController) Add() {
 
 	//移除空格
 	req.CreditCode = utils.TrimStr(req.CreditCode)
-
-	var startDateTime, endDateTime time.Time
-	if req.Status == utils.COMPANY_STATUS_TRY_OUT {
-		startDateTime = time.Now()
-		endDateTime = time.Now().AddDate(0, 2, 0)
-	} else if req.Status == utils.COMPANY_STATUS_FOREVER {
-		startDateTime = time.Now()
-		endDateTime = time.Now().AddDate(100, 0, 0)
-	} else {
-		br.Msg = "无效的客户状态，请重新选择"
-		return
-	}
-	var startDate, endDate string
-	startDate = startDateTime.Format(utils.FormatDate)
-	endDate = endDateTime.Format(utils.FormatDate)
-
 	if req.CompanyType == "" {
 		br.Msg = "请选择客户类型"
 		return
@@ -2776,6 +2760,24 @@ func (this *CompanyController) Add() {
 		return
 	}
 
+	var startDateTime, endDateTime time.Time
+	if req.Status == utils.COMPANY_STATUS_TRY_OUT {
+		startDateTime = time.Now()
+		endDateTime = time.Now().AddDate(0, 2, 0)
+		if productId == utils.COMPANY_PRODUCT_RAI_ID {
+			endDateTime = time.Now().AddDate(0, 1, 0) // 权益客户试用期改为1个月
+		}
+	} else if req.Status == utils.COMPANY_STATUS_FOREVER {
+		startDateTime = time.Now()
+		endDateTime = time.Now().AddDate(100, 0, 0)
+	} else {
+		br.Msg = "无效的客户状态，请重新选择"
+		return
+	}
+	var startDate, endDate string
+	startDate = startDateTime.Format(utils.FormatDate)
+	endDate = endDateTime.Format(utils.FormatDate)
+
 	if req.IndustryId <= 0 {
 		br.Msg = "请选择行业"
 		return
@@ -5095,6 +5097,9 @@ func (this *CompanyController) Receive() {
 		if req.Status == utils.COMPANY_STATUS_TRY_OUT {
 			startDateTime = time.Now()
 			endDateTime = time.Now().AddDate(0, 2, 0)
+			if productId == utils.COMPANY_PRODUCT_RAI_ID {
+				endDateTime = time.Now().AddDate(0, 1, 0) // 权益客户试用期改为1个月。 需求池 1035
+			}
 		} else if req.Status == utils.COMPANY_STATUS_FOREVER {
 			startDateTime = time.Now()
 			endDateTime = time.Now().AddDate(100, 0, 0)