Merge branch 'fix/approval_package_20230608' into debug

models/company/company.go

@@ -11,8 +11,8 @@ import (
 // TryOutToFormal 试用转正式
 func TryOutToFormal(companyId, productId, sellerId, companyContractId int, startDate, endDate, sellerName, productName string, packageType int) (err error) {
 	o := orm.NewOrm()
-	tx,err:=o.Begin()
-	if err!=nil {
+	tx, err := o.Begin()
+	if err != nil {
 		return err
 	}
 	defer func() {
@@ -22,11 +22,22 @@ func TryOutToFormal(companyId, productId, sellerId, companyContractId int, start
 			tx.Commit()
 		}
 	}()
+
+	// 套餐类型为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=? `
-	_, err = tx.Raw(sql, startDate, endDate, packageType, companyId, productId).Exec()
-	if err != nil {
-		return
+	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()
+		if err != nil {
+			return
+		}
+	} else {
+		_, err = tx.Raw(sql, startDate, endDate, packageType, companyId, productId).Exec()
+		if err != nil {
+			return
+		}
 	}
+
 	sql = `UPDATE company SET type=1,last_updated_time=NOW() WHERE company_id=? `
 	_, err = tx.Raw(sql, companyId).Exec()
 	if err != nil {
@@ -65,7 +76,7 @@ func TryOutToFormal(companyId, productId, sellerId, companyContractId int, start
 		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()
+		_, err = tx.Raw(sql, companyId, pv.ChartPermissionId, pv.ChartPermissionId, pv.StartDate, pv.EndDate, productId, productName, companyContractId, "正式", pv.IsUpgrade).Exec()
 		if err != nil {
 			return
 		}
@@ -73,11 +84,11 @@ func TryOutToFormal(companyId, productId, sellerId, companyContractId int, start
 	return
 }
 
-//服务更新
+// 服务更新
 func ApplyServiceUpdateOld(companyId, productId, sellerId, companyContractId int, startDate, endDate, sellerName, productName string) (err error) {
 	o := orm.NewOrm()
-	tx,err:=o.Begin()
-	if err!=nil {
+	tx, err := o.Begin()
+	if err != nil {
 		return err
 	}
 	defer func() {
@@ -140,8 +151,8 @@ func ApplyServiceUpdateOld(companyId, productId, sellerId, companyContractId int
 
 func ApplyServiceUpdate(companyId, productId, sellerId, companyContractId int, startDate, endDate, sellerName, productName string, packageType int) (err error) {
 	o := orm.NewOrm()
-	tx,err:=o.Begin()
-	if err!=nil {
+	tx, err := o.Begin()
+	if err != nil {
 		return err
 	}
 	defer func() {
@@ -219,10 +230,19 @@ func ApplyServiceUpdate(companyId, productId, sellerId, companyContractId int, s
 	//}
 
 	//更新客户产品信息
-	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()
-	if err != nil {
-		return
+	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()
+		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()
+		if err != nil {
+			return
+		}
 	}
 
 	contractPermission := make([]*company_contract.CompanyContractPermission, 0)