需求池1035 权益客户试用期改为 1个月

controllers/company.go

@@ -2926,6 +2926,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

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

@@ -1697,7 +1697,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)
@@ -2200,7 +2204,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

@@ -984,7 +984,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=? `

services/cygx/activity_special.go

@@ -629,20 +629,22 @@ func ActivitySpecialCompanyApproval(companyId, companyContractId int, companyNam
 			mapRaiSubjectivity[v.ChartPermissionId] = true
 			mapPermissionName[v.ChartPermissionId] = v.ChartPermissionName
 		}
+		var points int
 		for _, v := range list {
 			//如果是升级则加点
 			if v.IsUpgrade == 1 && mapRaiSubjectivity[v.ChartPermissionId] {
-				item := new(cygx.CygxActivitySpecialPermissionPoints)
-				item.Points = 5
-				item.CompanyId = companyId
-				item.CompanyName = companyName
-				item.ChartPermissionId = v.ChartPermissionId
-				item.ChartPermissionName = mapPermissionName[v.ChartPermissionId]
-				item.CreateTime = time.Now()
-				item.ModifyTime = time.Now()
-				items = append(items, item)
+				points += 4
 			}
 		}
+		item := new(cygx.CygxActivitySpecialPermissionPoints)
+		item.Points = points
+		item.CompanyId = companyId
+		item.CompanyName = companyName
+		item.ChartPermissionId = 0
+		item.ChartPermissionName = ""
+		item.CreateTime = time.Now()
+		item.ModifyTime = time.Now()
+		items = append(items, item)
 		itemBill.Content = "行业升级套餐转正"
 	}
 
@@ -668,7 +670,7 @@ func ActivitySpecialCompanyApproval(companyId, companyContractId int, companyNam
 			itemBillTotal = append(itemBillTotal, fmt.Sprint(v.ChartPermissionName, v.Points, "次"))
 			itemBillTotalMap[v.ChartPermissionName] = fmt.Sprint(v.ChartPermissionName, v.Points, "次")
 		}
-		itemBill.BillDetailed = 5 * len(items)
+		itemBill.BillDetailed = 4 * len(items)
 		permissionNameSlice := []string{"医药", "消费", "科技", "智造"}
 		var itemBillTotalNew []string
 		for _, v := range permissionNameSlice {
@@ -971,68 +973,3 @@ func HandleActivitySpecialTripBillTotalText(companyId int) (totalText string, er
 	}
 	return
 }
-
-func initnee885() {
-	list, err := cygx.GetBestNewBillList()
-	if err != nil {
-		fmt.Println(err)
-	}
-	var items []*cygx.CygxActivitySpecialPermissionPoints
-	for _, v := range list {
-		fmt.Println(v.Total)
-		if v.Total == "" || v.Total == "0" || v.Total == "0次" {
-			continue
-		}
-		//智造5次+科技5次+消费5次+医药4次
-		sliceTotal := strings.Split(v.Total, "+")
-
-		for _, vs := range sliceTotal {
-			var points string
-			item := new(cygx.CygxActivitySpecialPermissionPoints)
-			if strings.Contains(vs, "医药") {
-				item.ChartPermissionName = "医药"
-				points := strings.Replace(vs, "医药", "", -1)
-				fmt.Println(points)
-				points = strings.Replace(points, "次", "", -1)
-				item.Points, _ = strconv.Atoi(points)
-				item.ChartPermissionId = 22
-			} else if strings.Contains(vs, "消费") {
-				item.ChartPermissionName = "消费"
-				points := strings.Replace(vs, "消费", "", -1)
-				points = strings.Replace(points, "次", "", -1)
-				item.ChartPermissionId = 21
-				item.Points, _ = strconv.Atoi(points)
-			} else if strings.Contains(vs, "科技") {
-				item.ChartPermissionName = "科技"
-				points := strings.Replace(vs, "科技", "", -1)
-				points = strings.Replace(points, "次", "", -1)
-				item.ChartPermissionId = 20
-				item.Points, _ = strconv.Atoi(points)
-			} else if strings.Contains(vs, "智造") {
-				item.ChartPermissionName = "智造"
-				points := strings.Replace(vs, "智造", "", -1)
-				points = strings.Replace(points, "次", "", -1)
-				item.ChartPermissionId = 19
-				item.Points, _ = strconv.Atoi(points)
-			} else {
-				points = strings.Replace(vs, "次", "", -1)
-				item.Points, _ = strconv.Atoi(points)
-			}
-			fmt.Println("points", points)
-			fmt.Println(vs)
-
-			item.CompanyId = v.CompanyId
-			item.CompanyName = v.CompanyName
-			item.CreateTime = time.Now()
-			item.ModifyTime = time.Now()
-			fmt.Println(item)
-			items = append(items, item)
-		}
-
-	}
-
-	fmt.Println(len(items))
-	err = cygx.MultiAddCygxActivitySpecialPermissionPoints(items)
-	fmt.Println(err)
-
-}