fix:客户产品变更新增套餐类型变更

models/company/company.go

@@ -1,15 +1,15 @@
 package company
 
 import (
+	"github.com/rdlucklib/rdluck_tools/orm"
 	"hongze/hongze_task/models"
 	"hongze/hongze_task/models/company_contract"
 	"hongze/hongze_task/utils"
-	"github.com/rdlucklib/rdluck_tools/orm"
 	"time"
 )
 
-//试用转正式
-func TryOutToFormal(companyId, productId, sellerId, companyContractId int, startDate, endDate, sellerName, productName string) (err error) {
+// TryOutToFormal 试用转正式
+func TryOutToFormal(companyId, productId, sellerId, companyContractId int, startDate, endDate, sellerName, productName string, packageType int) (err error) {
 	o := orm.NewOrm()
 	o.Begin()
 	defer func() {
@@ -19,8 +19,8 @@ func TryOutToFormal(companyId, productId, sellerId, companyContractId int, start
 			o.Commit()
 		}
 	}()
-	sql := `UPDATE company_product SET status='正式',is_suspend=0,start_date=?,end_date=?,modify_time=NOW(),formal_time=NOW() WHERE company_id=? AND product_id=? `
-	_, err = o.Raw(sql, startDate, endDate, companyId, productId).Exec()
+	sql := `UPDATE company_product SET status='正式',is_suspend=0,start_date=?,end_date=?,package_type=?,modify_time=NOW(),formal_time=NOW() WHERE company_id=? AND product_id=? `
+	_, err = o.Raw(sql, startDate, endDate, packageType, companyId, productId).Exec()
 	if err != nil {
 		return
 	}
@@ -132,7 +132,7 @@ func ApplyServiceUpdateOld(companyId, productId, sellerId, companyContractId int
 	return
 }
 
-func ApplyServiceUpdate(companyId, productId, sellerId, companyContractId int, startDate, endDate, sellerName, productName string) (err error) {
+func ApplyServiceUpdate(companyId, productId, sellerId, companyContractId int, startDate, endDate, sellerName, productName string, packageType int) (err error) {
 	o := orm.NewOrm()
 	o.Begin()
 	defer func() {
@@ -210,8 +210,8 @@ func ApplyServiceUpdate(companyId, productId, sellerId, companyContractId int, s
 	//}
 
 	//更新客户产品信息
-	sql = `UPDATE company_product SET status='正式',is_suspend=0,start_date=?,end_date=?,modify_time=NOW() WHERE company_id=? AND product_id=? `
-	_, err = o.Raw(sql, updateStartDateTime, updateEndDateTime, companyId, productId).Exec()
+	sql = `UPDATE company_product SET status='正式',is_suspend=0,start_date=?,end_date=?,package_type=?,modify_time=NOW() WHERE company_id=? AND product_id=? `
+	_, err = o.Raw(sql, updateStartDateTime, updateEndDateTime, packageType, companyId, productId).Exec()
 	if err != nil {
 		return
 	}

models/company_contract/company_contract.go

@@ -22,6 +22,7 @@ type CompanyContract struct {
 	CreateTime        time.Time `description:"合同创建时间"`
 	ModifyTime        time.Time `description:"合同修改时间"`
 	Status            int       `description:"状态"`
+	PackageType       int       `description:"套餐类型，0：无，1：大套餐，2：小套餐"`
 }
 
 //通过开始日期获取当天开始的合同列表

models/company_product.go

@@ -1,8 +1,8 @@
 package models
 
 import (
-	"hongze/hongze_task/utils"
 	"github.com/rdlucklib/rdluck_tools/orm"
+	"hongze/hongze_task/utils"
 	"time"
 )
 
@@ -94,7 +94,7 @@ func CompanyTryOut(companyId, productId int) (companyReportPermissionList []*Com
 	endDate := time.Now().AddDate(0, 2, 0).Format(utils.FormatDate)
 
 	//客户产品 状态 变更
-	sql := `UPDATE company_product SET status='试用',start_date=?,end_date=?,modify_time=NOW(),try_out_time=NOW(),renewal_reason="" WHERE company_id=? AND product_id=? `
+	sql := `UPDATE company_product SET status='试用',start_date=?,end_date=?,modify_time=NOW(),try_out_time=NOW(),renewal_reason="",package_type=0 WHERE company_id=? AND product_id=? `
 	_, err = o.Raw(sql, startDate, endDate, companyId, productId).Exec()
 	if err != nil {
 		return
@@ -164,6 +164,7 @@ type CompanyProduct struct {
 	LossTime         time.Time `description:"流失时间"`
 	CompanyType      string    `description:"客户类型"`
 	OpenCode         string    `description:"开放给第三方的编码，不让第三方定位我们的客户信息"`
+	PackageType      int       `description:"套餐类型，0：无，1：大套餐，2：小套餐"`
 }
 
 //获取产品详情

services/company_contract/company_contract.go

@@ -67,9 +67,9 @@ 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)
+			company.TryOutToFormal(v.CompanyId, v.ProductId, utils.AdminId, v.CompanyContractId, v.StartDate, v.EndDate, utils.RealName, v.ProductName, v.PackageType)
 		case 5, 6:
-			company.ApplyServiceUpdate(v.CompanyId, v.ProductId, utils.AdminId, v.CompanyContractId, v.StartDate, v.EndDate, utils.RealName, v.ProductName)
+			company.ApplyServiceUpdate(v.CompanyId, v.ProductId, utils.AdminId, v.CompanyContractId, v.StartDate, v.EndDate, utils.RealName, v.ProductName, v.PackageType)
 		default:
 			errorList = append(errorList, fmt.Sprint("合同id:", v.CompanyContractId, "；审批单类型异常"))
 			continue