|
|
@@ -186,7 +186,7 @@ func TryOutToFormal(companyId, productId, sellerId, companyApprovalId, companyCo
|
|
|
o.Commit()
|
|
|
}
|
|
|
}()
|
|
|
- sql := `UPDATE company_product SET status='正式',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=? `
|
|
|
+ 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 = o.Raw(sql, startDate, endDate, packageType, companyId, productId).Exec()
|
|
|
if err != nil {
|
|
|
return
|
|
|
@@ -268,7 +268,8 @@ func FreezeToTryOut(companyId, productId, sellerId, companyApprovalId, applyUser
|
|
|
}
|
|
|
|
|
|
//更新用户产品状态
|
|
|
- sql := `UPDATE company_product SET status='试用',approve_status='已审批',freeze_start_date=null,freeze_end_date=null,freeze_time=null,
|
|
|
+ //6.9 fix 未续约强制弹窗要求客户冻结转试用后不弹床，取消清空冻结时间以标记曾经被冻结过
|
|
|
+ sql := `UPDATE company_product SET status='试用',approve_status='已审批',freeze_start_date=null,freeze_end_date=null,
|
|
|
start_date=?,end_date=?,seller_id=?,seller_name=?,group_id=?,department_id=?,modify_time=NOW(),try_stage=1 WHERE company_id=? AND product_id=? `
|
|
|
_, err = o.Raw(sql, startDate, endDate, sellerItem.AdminId, sellerItem.RealName, sellerItem.GroupId, sellerItem.DepartmentId, companyId, productId).Exec()
|
|
|
if err != nil {
|
|
|
@@ -435,7 +436,7 @@ func ApplyReceive(companyId, productId, sysUserId, companyApprovalId, applyUserI
|
|
|
endDate := time.Now().AddDate(0, 2, 0).Format(utils.FormatDate)
|
|
|
|
|
|
//更新用户产品状态
|
|
|
- sql := `UPDATE company_product SET status='试用',approve_status='已审批', start_date=?,end_date=?,seller_id=?,seller_name=?,group_id=?,department_id=?,modify_time=NOW(),try_stage=1 WHERE company_id=? AND product_id=? `
|
|
|
+ sql := `UPDATE company_product SET status='试用',approve_status='已审批',try_out_time=NULL,last_description_time=NULL, start_date=?,end_date=?,seller_id=?,seller_name=?,group_id=?,department_id=?,modify_time=NOW(),try_stage=1 WHERE company_id=? AND product_id=? `
|
|
|
_, err = o.Raw(sql, startDate, endDate, sellerItem.AdminId, sellerItem.RealName, sellerItem.GroupId, sellerItem.DepartmentId, companyId, productId).Exec()
|
|
|
if err != nil {
|
|
|
return
|
ziwen