diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index dde8d2252..440256172 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -2239,7 +2239,7 @@ func GetTopSkusByCityCode(ctx *jxcontext.Context, cityCode, storeID int) (skuNam } } } else { - skuNameAndPlace = skuNameAndPlaceList + skuNameAndPlaceList = append(skuNameAndPlaceList,skuNameAndPlace...) } i := 1 for _, v := range skuNameAndPlaceList { diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go index 2a76b8296..48e315325 100644 --- a/business/model/dao/store_sku.go +++ b/business/model/dao/store_sku.go @@ -1074,12 +1074,11 @@ func GetTopSkusByStoreIDs(db *DaoDB, storeIDs []int) (storeSkuNameExt []*StoreSk func GetTopSkusByCityCode(db *DaoDB, cityCode int, orderCreate time.Time) (skuNameAndPlace []*SkuNameAndPlace, err error) { sql := ` - SELECT t1.*, t2.* - FROM - (SELECT SUM(b.count) count, c.name_id, e.name city_name, d.city_code + SELECT SUM(b.count) count, c.name_id, e.name city_name, d.city_code FROM goods_order a JOIN order_sku b ON a.vendor_order_id = b.vendor_order_id AND a.vendor_id = b.vendor_id JOIN sku c ON b.sku_id = c.id AND c.deleted_at = ? + JOIN sku_name f ON f.id = c.name_id JOIN store d ON d.id = a.store_id AND d.deleted_at = ? AND d.city_code = ? JOIN place e ON e.code = d.city_code WHERE 1=1 @@ -1087,8 +1086,6 @@ func GetTopSkusByCityCode(db *DaoDB, cityCode int, orderCreate time.Time) (skuNa AND a.created_at BETWEEN ? and NOW() GROUP BY 2,3,4 ORDER BY count DESC - )t1 - JOIN sku_name t2 ON t2.id = t1.name_id ` sqlParams := []interface{}{ utils.DefaultTimeValue,