xingzai преди 1 година
родител
ревизия
308c57218a
променени са 2 файла, в които са добавени 33 реда и са изтрити 23 реда
  1. 22 22
      services/company_apply/company_approval.go
  2. 11 1
      services/cygx/activity_special.go

+ 22 - 22
services/company_apply/company_approval.go

@@ -391,29 +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, recordInfo.CompanyContractId, companyInfo.CompanyName) //审批通过的时候专项调研次数更新
-						//cygxService.ActivitySpecialCompanyApproval(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, recordInfo.CompanyContractId, companyInfo.CompanyName) //审批通过的时候专项调研次数更新
+					//cygxService.ActivitySpecialCompanyApproval(recordInfo.CompanyContractId) //审批通过的时候专项调研次数更新
+				}
+				//}
 
 				//权益销售客户申请转正后,消息群发给所有销售
 				services.AddCompanyApprovalMessageRai(recordInfo.CompanyId, recordInfo.CompanyContractId, recordInfo.ApplyRealName, companyInfo.CompanyName)

+ 11 - 1
services/cygx/activity_special.go

@@ -540,7 +540,17 @@ func GetChartPermissionSpecialSurplusByCompany(companyId int) (userType int, tri
 }
 
 //func init() {
-//	ActivitySpecialCompanyApproval(7012, 1213, "10.11添加客户升级")
+//	//ActivitySpecialCompanyApproval(7026, 1256, "测试销售绑定关系")
+//
+//	//格式化合同开始时间
+//	contractStartDate, tmpErr := time.Parse(utils.FormatDate, "2023-12-19")
+//	if tmpErr != nil {
+//		fmt.Println(tmpErr)
+//		return
+//	}
+//	if time.Now().After(contractStartDate) {
+//		fmt.Println("go")
+//	}
 //}
 
 // 审批通过的时候专项调研次数更新