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

controllers/company.go

@@ -2723,22 +2723,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
@@ -2756,6 +2740,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
@@ -2906,6 +2908,9 @@ func (this *CompanyController) Add() {
 	if req.Status == utils.COMPANY_STATUS_TRY_OUT {
 		item.EndDate = time.Now().AddDate(0, 2, 0).Format(utils.FormatDate)
 		item.CompanyType = 2
+		if productId == utils.COMPANY_PRODUCT_RAI_ID {
+			item.EndDate = time.Now().AddDate(0, 1, 0).Format(utils.FormatDate) // 权益客户试用期改为1个月
+		}
 	}
 
 	item.FirstStartDate = item.StartDate
@@ -5072,6 +5077,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)

controllers/company_apply.go

@@ -1406,7 +1406,11 @@ func (this *CompanyApplyController) ApplyThawOld() {
 					delayItem.CompanyApplyId = companyApprovalId
 					delayItem.ChartPermissionId = permissionId
 					delayItem.StartDate = time.Now().Format(utils.FormatDate)
-					delayItem.EndDate = time.Now().AddDate(0, 2, 0).Format(utils.FormatDate)
+					if productId == utils.COMPANY_PRODUCT_RAI_ID { // 权益客户试用期改为1个月。 需求池 1035
+						delayItem.EndDate = time.Now().AddDate(0, 1, 0).Format(utils.FormatDate)
+					} else {
+						delayItem.EndDate = time.Now().AddDate(0, 2, 0).Format(utils.FormatDate)
+					}
 					delayItem.CreateTime = time.Now()
 					delayItem.ModifyTime = time.Now()
 					err = company.AddCompanyDelayPermission(delayItem)
@@ -1599,7 +1603,12 @@ func (this *CompanyApplyController) ApplyDelayOld() {
 							delayItem.CompanyApplyId = companyApprovalId
 							delayItem.ChartPermissionId = permissionId
 							delayItem.StartDate = time.Now().Format(utils.FormatDate)
-							delayItem.EndDate = time.Now().AddDate(0, 2, 0).Format(utils.FormatDate)
+							if productId == utils.COMPANY_PRODUCT_RAI_ID { // 权益客户试用期改为1个月。 需求池 1035
+								delayItem.EndDate = time.Now().AddDate(0, 1, 0).Format(utils.FormatDate)
+							} else {
+								delayItem.EndDate = time.Now().AddDate(0, 2, 0).Format(utils.FormatDate)
+							}
+
 							delayItem.CreateTime = time.Now()
 							delayItem.ModifyTime = time.Now()
 							err = company.AddCompanyDelayPermission(delayItem)

controllers/company_apply_v2.go

@@ -1665,7 +1665,11 @@ func (this *CompanyApplyController) ApplyThaw() {
 					delayItem.CompanyApplyId = companyApprovalId
 					delayItem.ChartPermissionId = permissionId
 					delayItem.StartDate = time.Now().Format(utils.FormatDate)
-					delayItem.EndDate = time.Now().AddDate(0, 2, 0).Format(utils.FormatDate)
+					if productId == utils.COMPANY_PRODUCT_RAI_ID { // 权益客户试用期改为1个月。 需求池 1035
+						delayItem.EndDate = time.Now().AddDate(0, 1, 0).Format(utils.FormatDate)
+					} else {
+						delayItem.EndDate = time.Now().AddDate(0, 2, 0).Format(utils.FormatDate)
+					}
 					delayItem.CreateTime = time.Now()
 					delayItem.ModifyTime = time.Now()
 					err = company.AddCompanyDelayPermission(delayItem)
@@ -2168,7 +2172,12 @@ func (this *CompanyApplyController) ApplyReceive() {
 					delayItem.CompanyApplyId = companyApprovalId
 					delayItem.ChartPermissionId = permissionId
 					delayItem.StartDate = time.Now().Format(utils.FormatDate)
-					delayItem.EndDate = time.Now().AddDate(0, 2, 0).Format(utils.FormatDate)
+					if productId == utils.COMPANY_PRODUCT_RAI_ID { // 权益客户试用期改为1个月。 需求池 1035
+						delayItem.EndDate = time.Now().AddDate(0, 1, 0).Format(utils.FormatDate)
+					} else {
+						delayItem.EndDate = time.Now().AddDate(0, 2, 0).Format(utils.FormatDate)
+					}
+
 					delayItem.CreateTime = time.Now()
 					delayItem.ModifyTime = time.Now()
 					err = company.AddCompanyDelayPermission(delayItem)

controllers/company_permission.go

@@ -932,6 +932,9 @@ func (this *CompanyPermissionController) PermissionAddTryOut() {
 	companyReportPermissionList := make([]*company.CompanyReportPermission, 0) //添加的品种
 	startDateTime := time.Now()
 	endDateTime := startDateTime.AddDate(0, 2, 0)
+	if product == utils.COMPANY_PRODUCT_RAI_ID { // 权益客户试用期改为1个月。 需求池 1035
+		endDateTime = startDateTime.AddDate(0, 1, 0)
+	}
 	for _, v := range permissionArr {
 		permissionId, _ := strconv.Atoi(v)
 		count, err := company.GetCompanyPermissionCheck(req.CompanyId, permissionId)

models/company/company.go

@@ -965,7 +965,11 @@ func MoveSeller(companyId, productId, sellerId, groupId, departmentId int, selle
 	}()
 
 	startDateTime = time.Now()
-	endDateTime = time.Now().AddDate(0, 2, 0)
+	if productId == utils.COMPANY_PRODUCT_RAI_ID { // 权益客户试用期改为1个月。 需求池 1035
+		endDateTime = time.Now().AddDate(0, 1, 0)
+	} else {
+		endDateTime = time.Now().AddDate(0, 2, 0)
+	}
 
 	startDate := startDateTime.Format(utils.FormatDate)
 	endDate := endDateTime.Format(utils.FormatDate)

models/company/company_approval.go

@@ -403,6 +403,9 @@ func FreezeToTryOut(companyId, productId, sellerId, companyApprovalId, applyUser
 	}()
 	startDate = time.Now().Format(utils.FormatDate)
 	endDate = time.Now().AddDate(0, 2, 0).Format(utils.FormatDate)
+	if productId == utils.COMPANY_PRODUCT_RAI_ID { // 权益客户试用期改为1个月。 需求池 1035
+		endDate = time.Now().AddDate(0, 1, 0).Format(utils.FormatDate)
+	}
 
 	//sellerItem, err := system.GetSysAdminById(applyUserId)
 	//if err != nil {
@@ -643,6 +646,9 @@ func TryOutDelay(companyId, productId, sellerId, companyApprovalId int, sellerNa
 		return
 	}
 	newEndDate = endDateTime.AddDate(0, 2, 0).Format(utils.FormatDate)
+	if productId == utils.COMPANY_PRODUCT_RAI_ID { // 权益客户试用期改为1个月。 需求池 1035
+		newEndDate = endDateTime.AddDate(0, 1, 0).Format(utils.FormatDate)
+	}
 	//更新用户产品状态
 	sql := `UPDATE company_product SET approve_status='已审批',is_suspend=0,end_date=?,modify_time=NOW() WHERE company_id=? AND product_id=? `
 	_, err = to.Raw(sql, newEndDate, companyId, productId).Exec()
@@ -767,6 +773,9 @@ func ApplyReceive(companyId, productId, sysUserId, companyApprovalId int, seller
 
 	startDate = time.Now().Format(utils.FormatDate)
 	endDate = time.Now().AddDate(0, 2, 0).Format(utils.FormatDate)
+	if productId == utils.COMPANY_PRODUCT_RAI_ID { // 权益客户试用期改为1个月。 需求池 1035
+		endDate = time.Now().AddDate(0, 1, 0).Format(utils.FormatDate)
+	}
 
 	//更新用户产品状态
 	sql := `UPDATE company_product SET status='试用',try_out_time=NULL,last_description_time=NULL,is_suspend=0,approve_status='已审批', start_date=?,end_date=?,seller_id=?,seller_name=?,group_id=?,department_id=?,modify_time=NOW(),try_stage=1 WHERE company_id=? AND product_id=? `