|
@@ -391,6 +391,29 @@ func Approved(approvalRecord *contract.ContractApprovalRecord, opUser *system.Ad
|
|
|
// 处理权益客户的身份信息()
|
|
|
cygxService.UpdateCygxCompanyUserType(recordInfo.CompanyContractId)
|
|
|
|
|
|
+ if recordInfo.ApplyMethod == 1{
|
|
|
+ //获取合同信息
|
|
|
+ contractInfo, tmpErr := company.GetCompanyContractDetail(recordInfo.CompanyId, recordInfo.ProductId, recordInfo.CompanyContractId)
|
|
|
+ if tmpErr != nil {
|
|
|
+ err = errors.New(fmt.Sprint("待审批信息不存在,CompanyId:", recordInfo.CompanyId, ";productId:", recordInfo.ProductId, ";Err:"+tmpErr.Error()))
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if contractInfo == nil {
|
|
|
+ err = errors.New(fmt.Sprint("待审批信息不存在,CompanyId:", recordInfo.CompanyId, ";productId:", recordInfo.ProductId))
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+ //格式化合同开始时间
|
|
|
+ contractStartDate, tmpErr := time.Parse(utils.FormatDate, contractInfo.StartDate)
|
|
|
+ if tmpErr != nil {
|
|
|
+ err = errors.New("合同开始时间转换失败,Err:" + tmpErr.Error())
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if time.Now().After(contractStartDate) {
|
|
|
+ cygxService.ActivitySpecialCompanyApproval(recordInfo.CompanyId, companyInfo.CompanyName) //审批通过的时候专项调研次数更新
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
//权益销售客户申请转正后,消息群发给所有销售
|
|
|
services.AddCompanyApprovalMessageRai(recordInfo.CompanyId, recordInfo.CompanyContractId, recordInfo.ApplyRealName, companyInfo.CompanyName)
|
|
|
|
|
@@ -653,8 +676,6 @@ func afterApproved(companyApprovalId int, opUserId int, opUserName string) (err
|
|
|
err = errors.New("试用转正式失败,Err:" + tmpErr.Error())
|
|
|
return
|
|
|
}
|
|
|
-
|
|
|
- go cygxService.ActivitySpecialCompanyApproval(recodeInfo.CompanyId, companyInfo.CompanyName) //审批通过的时候专项调研次数更新
|
|
|
} else {
|
|
|
tmpErr = company.ApplyApproveContract(recodeInfo.CompanyId, recodeInfo.ProductId, recodeInfo.CompanyApprovalId, contractInfo.CompanyContractId)
|
|
|
if tmpErr != nil {
|