|
@@ -1287,9 +1287,11 @@ func UpdateWeekAvg() (err error) {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- //非正式客户数据修改
|
|
|
- var itemsUpdateFormalNo []*rai_serve.CygxRaiServeCompany
|
|
|
- if len(formalNoCompanyIds) > 0 { //非正式客户信息
|
|
|
+ var itemsUpdateFormalNo []*rai_serve.CygxRaiServeCompany //非正式客户数据修改
|
|
|
+ var itemsUpdateFormalNoContract []*rai_serve.CygxRaiServeCompany //非正式客户没有合同的客户修改
|
|
|
+
|
|
|
+ mapContractCompanyIds := make(map[int]bool) //签过合同的试用客户ID
|
|
|
+ if len(formalNoCompanyIds) > 0 { //非正式客户信息
|
|
|
condition = ""
|
|
|
pars = make([]interface{}, 0)
|
|
|
condition = ` AND product_id = 2 AND company_id IN (` + utils.GetOrmInReplace(len(formalNoCompanyIds)) + `) AND status = 1 AND end_date < ? GROUP BY company_id ORDER BY company_contract_id DESC `
|
|
@@ -1331,6 +1333,22 @@ func UpdateWeekAvg() (err error) {
|
|
|
}
|
|
|
item.PermissionName = permissionNameMapByContractId[v.CompanyContractId]
|
|
|
itemsUpdateFormalNo = append(itemsUpdateFormalNo, item)
|
|
|
+ mapContractCompanyIds[v.CompanyId] = true
|
|
|
+ }
|
|
|
+
|
|
|
+ for _, v := range formalNoCompanyIds {
|
|
|
+ if mapContractCompanyIds[v] {
|
|
|
+ continue
|
|
|
+ }
|
|
|
+ fmt.Println(v)
|
|
|
+ item := new(rai_serve.CygxRaiServeCompany)
|
|
|
+ item.CompanyId = v
|
|
|
+
|
|
|
+ item.ServeCoverageRate = utils.SubFloatToString(mapWeekServeCount[v]/4, 2)
|
|
|
+ if mapWeekIsKp[v] {
|
|
|
+ item.IsUserMaker = 1
|
|
|
+ }
|
|
|
+ itemsUpdateFormalNoContract = append(itemsUpdateFormalNoContract, item)
|
|
|
}
|
|
|
}
|
|
|
e = rai_serve.UpdateCygxRaiServeCompanyFormalNoMulti(itemsUpdateFormalNo)
|
|
@@ -1338,6 +1356,12 @@ func UpdateWeekAvg() (err error) {
|
|
|
err = errors.New("UpdateCygxRaiServeCompanyFormalNoMulti, Err: " + e.Error())
|
|
|
return
|
|
|
}
|
|
|
+
|
|
|
+ e = rai_serve.UpdateCygxRaiServeCompanyFormalNoContractMulti(itemsUpdateFormalNoContract)
|
|
|
+ if e != nil {
|
|
|
+ err = errors.New("UpdateCygxRaiServeCompanyFormalNoMulti, Err: " + e.Error())
|
|
|
+ return
|
|
|
+ }
|
|
|
fmt.Println(" UpdateWeekAvg end")
|
|
|
return
|
|
|
}
|