Merge branch 'crm_17.0_ficc' of http://8.136.199.33:3000/hongze/hongze_task into debug

services/overseas_custom/custom.go

@@ -21,13 +21,13 @@ func FixEnglishCompanyRoadShowTotal(cont context.Context) (err error) {
 		fmt.Println("GetRsCompanyTotal Err:" + err.Error())
 		return err
 	}
-	mapSellerTotal := make(map[int]int) //对应公司下 销售预约活动数量
+	mapCompanyTotal := make(map[int]int) //对应公司下 销售预约活动数量
 	for _, v := range listSeller {
-		mapSellerTotal[v.CompanyId] = v.Total
+		mapCompanyTotal[v.CompanyId] = v.Total
 	}
 
 	for _, v := range list {
-		v.Total += mapSellerTotal[v.CompanyId]
+		mapCompanyTotal[v.CompanyId] += v.Total
 	}
 
 	companyList, err := obj.GetEnglishCompanyAll()
@@ -41,18 +41,30 @@ func FixEnglishCompanyRoadShowTotal(cont context.Context) (err error) {
 		companyMap[v.CompanyId] = v.RoadShowTotal
 	}
 
-	for _, v := range list {
-		if v.Total > 0 {
-			if val, ok := companyMap[v.CompanyId]; ok {
-				if val != v.Total {
-					err = obj.UpdateEnglishCompanyRoadShowTotal(v.CompanyId, v.Total)
-					if err != nil {
-						fmt.Println("UpdateEnglishCompanyRoadShowTotal Err:" + err.Error())
-						return err
-					}
+	//for _, v := range list {
+	//	if v.Total > 0 {
+	//		if val, ok := companyMap[v.CompanyId]; ok {
+	//			if val != v.Total {
+	//				err = obj.UpdateEnglishCompanyRoadShowTotal(v.CompanyId, v.Total)
+	//				if err != nil {
+	//					fmt.Println("UpdateEnglishCompanyRoadShowTotal Err:" + err.Error())
+	//					return err
+	//				}
+	//			}
+	//		}
+	//
+	//	}
+	//}
+
+	for companyId, total := range companyMap {
+		if val, ok := companyMap[companyId]; ok {
+			if val != total {
+				err = obj.UpdateEnglishCompanyRoadShowTotal(companyId, total)
+				if err != nil {
+					fmt.Println("UpdateEnglishCompanyRoadShowTotal Err:" + err.Error())
+					return err
 				}
 			}
-
 		}
 	}
 	return nil

services/roadshow/company_product.go

@@ -9,12 +9,17 @@ func RoadShow(cont context.Context) (err error) {
 	roadShowTotalList, _ := GetRoadShowTotal()
 	roadShowTotalListSeller, _ := GetRoadShowTotalSellerActivity()
 
-	mapSellerTotal := make(map[int]int) //对应公司下 销售预约活动数量
+	mapCompanyTotal := make(map[int]int) //对应公司下 销售预约活动数量
 	for _, v := range roadShowTotalListSeller {
-		mapSellerTotal[v.CompanyId] = v.Total
+		mapCompanyTotal[v.CompanyId] = v.Total
 	}
-	for _, roadShowTotal := range roadShowTotalList {
-		err := updateProduct(roadShowTotal.Total+mapSellerTotal[roadShowTotal.CompanyId], roadShowTotal.CompanyId)
+
+	for _, v := range roadShowTotalList {
+		mapCompanyTotal[v.CompanyId] += v.Total
+	}
+
+	for companyId, total := range mapCompanyTotal {
+		err := updateProduct(total, companyId)
 		if err != nil {
 			return err
 		}