Merge branch 'master' of e.coding.net:rosydev/jx-callback

2019-12-10 17:47:19 +08:00
parent 99a00476ef 933a18d362
commit 5363e34209
10 changed files with 350 additions and 162 deletions
--- a/business/jxstore/misc/store_sku_sales.go
+++ b/business/jxstore/misc/store_sku_sales.go
@@ -74,7 +74,7 @@ func GetStoreSkuSalesInfo(ctx *jxcontext.Context, storeID int) (outStoreSkuSales
 	}

 	//得到当前门店商品数据
-	storeSkuMapData := make(map[int]*cms.StoreSkuNameExt)
+	storeSkuMapData := make(map[int]*dao.StoreSkuNameExt)
 	storeSkuData, err := cms.GetStoreSkus(ctx, storeID, citySkuIDs, true, "", true, false, map[string]interface{}{}, 0, -1)
 	if err == nil {
 		for _, value := range storeSkuData.SkuNames {