Merge branch 'activity' into debug

models/company/company.go

@@ -19,7 +19,7 @@ func TryOutToFormal(companyId, productId, sellerId, companyContractId int, start
 			o.Commit()
 		}
 	}()
-	sql := `UPDATE company_product SET status='正式',start_date=?,end_date=?,modify_time=NOW(),formal_time=NOW() WHERE company_id=? AND product_id=? `
+	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()
 	if err != nil {
 		return
@@ -210,7 +210,7 @@ func ApplyServiceUpdate(companyId, productId, sellerId, companyContractId int, s
 	//}
 
 	//更新客户产品信息
-	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='正式',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()
 	if err != nil {
 		return