Merge branch 'cygx_need_1035' of http://8.136.199.33:3000/hongze/hongze_mobile_admin into debug

models/tables/company_approval/company_approval.go

@@ -410,6 +410,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 {
+		endDate = time.Now().AddDate(0, 1, 0).Format(utils.FormatDate) // 权益客户试用期改为1个月。 需求池 1035
+	}
 
 	//sellerItem, err := admin.GetAdminById(applyUserId)
 
@@ -647,6 +650,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 {
+		newEndDate = endDateTime.AddDate(0, 1, 0).Format(utils.FormatDate) // 权益客户试用期改为1个月。 需求池 1035
+	}
 	//更新用户产品状态
 	sql := `UPDATE company_product SET approve_status='已审批',end_date=?,modify_time=NOW() WHERE company_id=? AND product_id=? `
 	_, err = tx.Raw(sql, newEndDate, companyId, productId).Exec()
@@ -771,6 +777,9 @@ func ApplyReceive(companyId, productId, sysUserId, companyApprovalId, applyUserI
 	}
 	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='试用',approve_status='已审批',try_out_time=NULL,last_description_time=NULL, start_date=?,end_date=?,seller_id=?,seller_name=?,group_id=?,department_id=?,modify_time=NOW(),try_stage=1,todo_status="无任务",todo_create_time=null,todo_approve_time=null,todo_modify_time=null,todo_end_time=null WHERE company_id=? AND product_id=? `

services/cygx/activity_special.go

@@ -191,20 +191,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 = "行业升级套餐转正"
 	}
 
@@ -228,7 +230,7 @@ func ActivitySpecialCompanyApproval(companyId, companyContractId int, companyNam
 		for _, v := range activitySpecialPermissionPointsList {
 			itemBillTotal = append(itemBillTotal, fmt.Sprint(v.ChartPermissionName, v.Points, "次"))
 		}
-		itemBill.BillDetailed = 5 * len(items)
+		itemBill.BillDetailed = 4 * len(items)
 		itemBill.Total = strings.Join(itemBillTotal, "+")
 	}