权益-非标转正主客观

models/company/company.go

@@ -9,7 +9,7 @@ import (
 )
 
 // TryOutToFormal 试用转正式
-func TryOutToFormal(companyId, productId, sellerId, companyContractId int, startDate, endDate, sellerName, productName string, packageType int) (err error) {
+func TryOutToFormal(companyId, productId, sellerId, companyContractId int, startDate, endDate, sellerName, productName string, packageType, raiPackageType int) (err error) {
 	o := orm.NewOrm()
 	tx, err := o.Begin()
 	if err != nil {
@@ -24,15 +24,15 @@ func TryOutToFormal(companyId, productId, sellerId, companyContractId int, start
 	}()
 
 	// 套餐类型为0时, 不更新套餐类型
-	sql := `UPDATE company_product SET status='正式',try_out_time=NULL,last_description_time=NULL,freeze_time=NULL,renewal_intention=0,is_suspend=0,is_formal=1,start_date=?,end_date=?,package_type=?,modify_time=NOW(),formal_time=NOW(),try_stage=1 WHERE company_id=? AND product_id=? `
+	sql := `UPDATE company_product SET status='正式',try_out_time=NULL,last_description_time=NULL,freeze_time=NULL,renewal_intention=0,is_suspend=0,is_formal=1,start_date=?,end_date=?,package_type=?,rai_package_type=?,modify_time=NOW(),formal_time=NOW(),try_stage=1 WHERE company_id=? AND product_id=? `
 	if packageType == 0 {
-		sql = `UPDATE company_product SET status='正式',try_out_time=NULL,last_description_time=NULL,freeze_time=NULL,renewal_intention=0,is_suspend=0,is_formal=1,start_date=?,end_date=?,modify_time=NOW(),formal_time=NOW(),try_stage=1 WHERE company_id=? AND product_id=? `
-		_, err = tx.Raw(sql, startDate, endDate, companyId, productId).Exec()
+		sql = `UPDATE company_product SET status='正式',try_out_time=NULL,last_description_time=NULL,freeze_time=NULL,renewal_intention=0,is_suspend=0,is_formal=1,start_date=?,end_date=?,rai_package_type=?,modify_time=NOW(),formal_time=NOW(),try_stage=1 WHERE company_id=? AND product_id=? `
+		_, err = tx.Raw(sql, startDate, endDate, raiPackageType, companyId, productId).Exec()
 		if err != nil {
 			return
 		}
 	} else {
-		_, err = tx.Raw(sql, startDate, endDate, packageType, companyId, productId).Exec()
+		_, err = tx.Raw(sql, startDate, endDate, packageType, raiPackageType, companyId, productId).Exec()
 		if err != nil {
 			return
 		}
@@ -74,9 +74,9 @@ func TryOutToFormal(companyId, productId, sellerId, companyContractId int, start
 	}
 	for _, pv := range contractPermission {
 		sql = `INSERT INTO company_report_permission(company_id, report_permission_id,created_time, last_updated_time,
-             chart_permission_id, start_date,end_date,product_id,product_name, modify_time,company_contract_id,status,is_upgrade) 
-			VALUES(?,?,NOW(),NOW(),?,?,?,?,?,NOW(),?,?,?) `
-		_, err = tx.Raw(sql, companyId, pv.ChartPermissionId, pv.ChartPermissionId, pv.StartDate, pv.EndDate, productId, productName, companyContractId, "正式", pv.IsUpgrade).Exec()
+             chart_permission_id, start_date,end_date,product_id,product_name, modify_time,company_contract_id,status,is_upgrade,expensive_yx) 
+			VALUES(?,?,NOW(),NOW(),?,?,?,?,?,NOW(),?,?,?,?) `
+		_, err = tx.Raw(sql, companyId, pv.ChartPermissionId, pv.ChartPermissionId, pv.StartDate, pv.EndDate, productId, productName, companyContractId, "正式", pv.IsUpgrade, pv.ExpensiveYx).Exec()
 		if err != nil {
 			return
 		}
@@ -149,7 +149,7 @@ func ApplyServiceUpdateOld(companyId, productId, sellerId, companyContractId int
 	return
 }
 
-func ApplyServiceUpdate(companyId, productId, sellerId, companyContractId int, startDate, endDate, sellerName, productName string, packageType int) (err error) {
+func ApplyServiceUpdate(companyId, productId, sellerId, companyContractId int, startDate, endDate, sellerName, productName string, packageType, raiPackageType int) (err error) {
 	o := orm.NewOrm()
 	tx, err := o.Begin()
 	if err != nil {
@@ -232,14 +232,14 @@ func ApplyServiceUpdate(companyId, productId, sellerId, companyContractId int, s
 	//更新客户产品信息
 	if packageType == 0 {
 		// 套餐类型为0时, 不更新套餐类型
-		sql = `UPDATE company_product SET status='正式',try_out_time=NULL,last_description_time=NULL,freeze_time=NULL,is_formal=1,is_suspend=0,start_date=?,end_date=?,modify_time=NOW(),try_stage=1 WHERE company_id=? AND product_id=? `
-		_, err = tx.Raw(sql, updateStartDateTime, updateEndDateTime, companyId, productId).Exec()
+		sql = `UPDATE company_product SET status='正式',try_out_time=NULL,last_description_time=NULL,freeze_time=NULL,is_formal=1,is_suspend=0,start_date=?,end_date=?,rai_package_type=?,modify_time=NOW(),try_stage=1 WHERE company_id=? AND product_id=? `
+		_, err = tx.Raw(sql, updateStartDateTime, updateEndDateTime, raiPackageType, companyId, productId).Exec()
 		if err != nil {
 			return
 		}
 	} else {
-		sql = `UPDATE company_product SET status='正式',try_out_time=NULL,last_description_time=NULL,freeze_time=NULL,is_formal=1,is_suspend=0,start_date=?,end_date=?,package_type=?,modify_time=NOW(),try_stage=1 WHERE company_id=? AND product_id=? `
-		_, err = tx.Raw(sql, updateStartDateTime, updateEndDateTime, packageType, companyId, productId).Exec()
+		sql = `UPDATE company_product SET status='正式',try_out_time=NULL,last_description_time=NULL,freeze_time=NULL,is_formal=1,is_suspend=0,start_date=?,end_date=?,package_type=?,rai_package_type=?,modify_time=NOW(),try_stage=1 WHERE company_id=? AND product_id=? `
+		_, err = tx.Raw(sql, updateStartDateTime, updateEndDateTime, packageType, raiPackageType, companyId, productId).Exec()
 		if err != nil {
 			return
 		}
@@ -281,8 +281,8 @@ func ApplyServiceUpdate(companyId, productId, sellerId, companyContractId int, s
 
 			//如果 需要更新 字段 为 true，那么就去更新
 			if needUpdate {
-				sql = `update company_report_permission set end_date=?,last_updated_time=now(),modify_time=now(),company_contract_id=?,status=? where company_report_permission_id=? `
-				_, tmpErr := tx.Raw(sql, pv.EndDate, companyContractId, "正式", nowPermission.CompanyReportPermissionId).Exec()
+				sql = `update company_report_permission set end_date=?,last_updated_time=now(),modify_time=now(),company_contract_id=?,status=?,is_upgrade=?,expensive_yx=? where company_report_permission_id=? `
+				_, tmpErr := tx.Raw(sql, pv.EndDate, companyContractId, "正式", pv.IsUpgrade, pv.ExpensiveYx, nowPermission.CompanyReportPermissionId).Exec()
 				err = tmpErr
 				if err != nil {
 					return
@@ -291,9 +291,9 @@ func ApplyServiceUpdate(companyId, productId, sellerId, companyContractId int, s
 
 		} else {
 			sql = `INSERT INTO company_report_permission(company_id, report_permission_id,created_time, last_updated_time,
-             chart_permission_id, start_date,end_date,product_id,product_name, modify_time,company_contract_id,status) 
-			VALUES(?,?,NOW(),NOW(),?,?,?,?,?,NOW(),?,?) `
-			_, tmpErr := tx.Raw(sql, companyId, pv.ChartPermissionId, pv.ChartPermissionId, pv.StartDate, pv.EndDate, productId, productName, companyContractId, "正式").Exec()
+             chart_permission_id, start_date,end_date,product_id,product_name, modify_time,company_contract_id,status,is_upgrade,expensive_yx) 
+			VALUES(?,?,NOW(),NOW(),?,?,?,?,?,NOW(),?,?,?,?) `
+			_, tmpErr := tx.Raw(sql, companyId, pv.ChartPermissionId, pv.ChartPermissionId, pv.StartDate, pv.EndDate, productId, productName, companyContractId, "正式", pv.IsUpgrade, pv.ExpensiveYx).Exec()
 			err = tmpErr
 			if err != nil {
 				return

models/company_contract/company_contract.go

@@ -23,9 +23,10 @@ type CompanyContract struct {
 	ModifyTime        time.Time `description:"合同修改时间"`
 	Status            int       `description:"状态"`
 	PackageType       int       `description:"套餐类型，0：无，1：大套餐，2：小套餐"`
+	RaiPackageType    int       `description:"权益套餐类型: 0-无; 1-70w大套餐; 2-45w大套餐"`
 }
 
-//通过开始日期获取当天开始的合同列表
+// 通过开始日期获取当天开始的合同列表
 func GetStartContractListByStartDate(startDate string) (total int64, list []*CompanyContract, err error) {
 	o := orm.NewOrm()
 	sql := "SELECT * FROM company_contract where start_date = ? AND status = 1 "
@@ -39,6 +40,8 @@ type CompanyContractPermission struct {
 	CompanyId         int       `description:"客户id"`
 	CompanyContractId int       `description:"合同id"`
 	ChartPermissionId int       `description:"权限id"`
+	IsUpgrade         int       `description:"是否升级，1是，0否"`
+	ExpensiveYx       int       `description:"权益研选: 0-3w; 1-5w"`
 	StartDate         string    `description:"开始日期"`
 	EndDate           string    `description:"结束日期"`
 	CreateTime        time.Time `description:"创建时间"`

models/company_report_permission.go

@@ -20,6 +20,7 @@ type CompanyReportPermission struct {
 	EndDate                   string    `description:"合同结束日期"`
 	ModifyTime                string    `description:"更新时间"`
 	IsUpgrade                 int       `description:"是否升级，1是，0否"`
+	ExpensiveYx               int       `description:"权益研选: 0-3w; 1-5w"`
 }
 
 // Update 更新客户产品权限
@@ -96,7 +97,7 @@ func CompanyReportPermissionClose(companyReportPermissionId int64, companyId, pr
 	return
 }
 
-//查询是否存在还未过期的产品权限
+// 查询是否存在还未过期的产品权限
 func GetCompanyReportPermissionCount(companyId, productId int) (count int, err error) {
 	o := orm.NewOrm()
 	startDate := time.Now().Format(utils.FormatDate)

services/company_contract/company_contract.go

@@ -14,7 +14,7 @@ import (
 	"time"
 )
 
-//合同处理
+// 合同处理
 func HandleCompanyContract(cont context.Context) (err error) {
 	defer func() {
 		if err != nil {
@@ -77,9 +77,11 @@ func HandleCompanyContract(cont context.Context) (err error) {
 		//申请类型：1:试用->正式,2:冻结—>试用,3:试用延期,4:原销售申请领取流失客户，5:正式客户申请服务更新
 		switch companyApproval.ApplyMethod {
 		case 1:
-			company.TryOutToFormal(v.CompanyId, v.ProductId, utils.AdminId, v.CompanyContractId, v.StartDate, v.EndDate, utils.RealName, v.ProductName, v.PackageType)
+			e := company.TryOutToFormal(v.CompanyId, v.ProductId, utils.AdminId, v.CompanyContractId, v.StartDate, v.EndDate, utils.RealName, v.ProductName, v.PackageType, v.RaiPackageType)
+			errorList = append(errorList, fmt.Sprint("合同id:", v.CompanyContractId, "；TryOutToFormal Err: ", e.Error()))
 		case 5, 6:
-			company.ApplyServiceUpdate(v.CompanyId, v.ProductId, utils.AdminId, v.CompanyContractId, v.StartDate, v.EndDate, utils.RealName, v.ProductName, v.PackageType)
+			e := company.ApplyServiceUpdate(v.CompanyId, v.ProductId, utils.AdminId, v.CompanyContractId, v.StartDate, v.EndDate, utils.RealName, v.ProductName, v.PackageType, v.RaiPackageType)
+			errorList = append(errorList, fmt.Sprint("合同id:", v.CompanyContractId, "；ApplyServiceUpdate Err: ", e.Error()))
 		default:
 			errorList = append(errorList, fmt.Sprint("合同id:", v.CompanyContractId, "；审批单类型异常"))
 			continue