fix: FICC套餐类型

models/tables/company_approval/company_approval.go

@@ -193,11 +193,22 @@ func TryOutToFormal(companyId, productId, sellerId, companyApprovalId, companyCo
 			_ = 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,approve_status='已审批',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,approve_status='已审批',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 {
@@ -721,11 +732,21 @@ func ApplyServiceUpdate(companyId, productId, sellerId, companyApprovalId, compa
 	//}
 
 	//更新客户产品信息
-	sql = `UPDATE company_product SET status='正式',is_formal=1,is_suspend=0,approve_status='已审批',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='正式',is_formal=1,is_suspend=0,approve_status='已审批',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='正式',is_formal=1,is_suspend=0,approve_status='已审批',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
+		}
 	}
+
 	sql = `UPDATE company_approval SET approve_status='已审批',approve_time=NOW(),modify_time=NOW() WHERE company_approval_id=? AND company_id=? AND product_id=? `
 	_, err = tx.Raw(sql, companyApprovalId, companyId, productId).Exec()
 	if err != nil {