Merge branch 'master' of http://8.136.199.33:3000/hongze/hongze_task

models/company_product.go

@@ -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() 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="" WHERE company_id=? AND product_id=? `
 	_, err = o.Raw(sql, startDate, endDate, companyId, productId).Exec()
 	if err != nil {
 		return

services/company_contract/company_contract.go

@@ -68,7 +68,7 @@ func HandleCompanyContract(cont context.Context) (err error) {
 		switch companyApproval.ApplyMethod {
 		case 1:
 			company.TryOutToFormal(v.CompanyId, v.ProductId, utils.AdminId, v.CompanyContractId, v.StartDate, v.EndDate, utils.RealName, v.ProductName)
-		case 5:
+		case 5, 6:
 			company.ApplyServiceUpdate(v.CompanyId, v.ProductId, utils.AdminId, v.CompanyContractId, v.StartDate, v.EndDate, utils.RealName, v.ProductName)
 		default:
 			errorList = append(errorList, fmt.Sprint("合同id:", v.CompanyContractId, "；审批单类型异常"))