From 6d90f5117d6a3fb57ec9c735d2c5c9834df93fc4 Mon Sep 17 00:00:00 2001
From: Rosy-zhudan <donmicro@qq.com>
Date: Thu, 19 Sep 2019 17:43:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86err?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/misc/store_sku_sales.go | 59 ++++++++++++++++--------
 1 file changed, 41 insertions(+), 18 deletions(-)

diff --git a/business/jxstore/misc/store_sku_sales.go b/business/jxstore/misc/store_sku_sales.go
index 50ece6a35..16315fa4c 100644
--- a/business/jxstore/misc/store_sku_sales.go
+++ b/business/jxstore/misc/store_sku_sales.go
@@ -20,8 +20,12 @@ const (
 func GetStoreSkuSalesInfo(ctx *jxcontext.Context, storeID int) (outStoreSkuSales []*model.StoreSkuSales, err error) {
 	db := dao.GetDB()
 	//得到所有门店
-	storeList, _ := GetStoreList(ctx)
-	storeList = GetFilterStoreListEx(storeList, nil)
+	storeList, err := GetStoreList(ctx)
+	if err == nil {
+		storeList = GetFilterStoreListEx(storeList, nil)
+	} else {
+		return nil, err
+	}
 	storeMapData := make(map[int]*cms.StoreExt)
 	for _, value := range storeList {
 		storeMapData[value.ID] = value
@@ -31,34 +35,50 @@ func GetStoreSkuSalesInfo(ctx *jxcontext.Context, storeID int) (outStoreSkuSales
 
 	//获取本市商品总销量
 	citySkuSalesCntMap := make(map[int]int)
-	citySkuSalesCntList, _ := dao.GetSkuSalesCntList(db, -1, cityCode, DayNum, LimitNum, nil)
+	citySkuSalesCntList, err := dao.GetSkuSalesCntList(db, -1, cityCode, DayNum, LimitNum, nil)
 	citySkuIDs := []int{}
-	for _, value := range citySkuSalesCntList {
-		citySkuSalesCntMap[value.SkuID] = value.Count
-		citySkuIDs = append(citySkuIDs, value.SkuID)
+	if err == nil {
+		for _, value := range citySkuSalesCntList {
+			citySkuSalesCntMap[value.SkuID] = value.Count
+			citySkuIDs = append(citySkuIDs, value.SkuID)
+		}
+	} else {
+		return nil, err
 	}
 
 	//获取本店商品总销量
 	storeSkuSalesCntMap := make(map[int]int)
-	storeSkuSalesCntList, _ := dao.GetSkuSalesCntList(db, storeID, cityCode, DayNum, -1, citySkuIDs)
-	for _, value := range storeSkuSalesCntList {
-		storeSkuSalesCntMap[value.SkuID] = value.Count
+	storeSkuSalesCntList, err := dao.GetSkuSalesCntList(db, storeID, cityCode, DayNum, -1, citySkuIDs)
+	if err == nil {
+		for _, value := range storeSkuSalesCntList {
+			storeSkuSalesCntMap[value.SkuID] = value.Count
+		}
+	} else {
+		return nil, err
 	}
 
 	//获取本店商品差评数量
 	storeSkuBadCommentCntMap := make(map[int]int)
-	storeSkuBadCommentCntList, _ := dao.GetSkuBadCommentCntList(db, storeID, DayNum)
-	for _, value := range storeSkuBadCommentCntList {
-		storeSkuBadCommentCntMap[value.SkuID] = value.Count
+	storeSkuBadCommentCntList, err := dao.GetSkuBadCommentCntList(db, storeID, DayNum)
+	if err == nil {
+		for _, value := range storeSkuBadCommentCntList {
+			storeSkuBadCommentCntMap[value.SkuID] = value.Count
+		}
+	} else {
+		return nil, err
 	}
 
 	//得到当前门店商品数据
-	storeSkuData, _ := cms.GetStoreSkus(ctx, storeID, citySkuIDs, true, "", true, map[string]interface{}{}, 0, -1)
 	storeSkuMapData := make(map[int]*cms.StoreSkuNameExt)
-	for _, value := range storeSkuData.SkuNames {
-		for _, skuInfo := range value.Skus2 {
-			storeSkuMapData[skuInfo.SkuID] = value
+	storeSkuData, err := cms.GetStoreSkus(ctx, storeID, citySkuIDs, true, "", true, map[string]interface{}{}, 0, -1)
+	if err == nil {
+		for _, value := range storeSkuData.SkuNames {
+			for _, skuInfo := range value.Skus2 {
+				storeSkuMapData[skuInfo.SkuID] = value
+			}
 		}
+	} else {
+		return nil, err
 	}
 
 	//得到5KM内的所有门店
@@ -70,7 +90,7 @@ func GetStoreSkuSalesInfo(ctx *jxcontext.Context, storeID int) (outStoreSkuSales
 	taskFunc := func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
 		storeInfo := batchItemList[0].(*cms.StoreExt)
 		storeID := storeInfo.ID
-		jxSkuInfoData, _ := cms.GetStoreSkus(ctx, storeID, citySkuIDs, true, "", true, map[string]interface{}{}, 0, -1)
+		jxSkuInfoData, err := cms.GetStoreSkus(ctx, storeID, citySkuIDs, true, "", true, map[string]interface{}{}, 0, -1)
 		jxSkuPriceMapData := make(map[int]int)
 		for _, value := range jxSkuInfoData.SkuNames {
 			for _, skuInfo := range value.Skus2 {
@@ -84,7 +104,10 @@ func GetStoreSkuSalesInfo(ctx *jxcontext.Context, storeID int) (outStoreSkuSales
 	}
 	taskParallel := tasksch.NewParallelTask("得到所有门店商品", nil, ctx, taskFunc, rangeStoreList)
 	taskParallel.Run()
-	taskParallel.GetResult(0)
+	_, err = taskParallel.GetResult(0)
+	if err != nil {
+		return nil, err
+	}
 
 	//计算商品的平均价格
 	skusTotalPrice := make(map[int]int)