From a08b13641491bebdbac7133d379ec6be66729190 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 25 Aug 2022 15:17:17 +0800 Subject: [PATCH 1/7] home --- business/jxstore/cms/store.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 0a95a97f2..30af1ea7f 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -5807,12 +5807,10 @@ func GetHomePageByLocation(ctx *jxcontext.Context, lng, lat float64, needWalkDis for _, i := range storeInfos { for _, j := range storeDeductionInfos { for _, k := range StoreSkuInfos { - if i.StoreID == j.StoreID && i.StoreID == k.StoreID { - homePage = HomePageInfos{ - StoreInfo: i, - StoreDeductionInfo: j, - StoreSkuInfo: k, - } + homePage = HomePageInfos{ + StoreInfo: i, + StoreDeductionInfo: j, + StoreSkuInfo: k, } } } From 044b3115155463c63f00b07d7d32a2a3a35e36f1 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 25 Aug 2022 15:25:59 +0800 Subject: [PATCH 2/7] home --- business/jxstore/cms/store.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 30af1ea7f..f5c5dfcaf 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -5805,12 +5805,14 @@ func GetHomePageByLocation(ctx *jxcontext.Context, lng, lat float64, needWalkDis } globals.SugarLogger.Debug("StoreSkuInfos=================", StoreSkuInfos) for _, i := range storeInfos { + homePage.StoreInfo = i for _, j := range storeDeductionInfos { + if i.StoreID == j.StoreID { + homePage.StoreDeductionInfo = j + } for _, k := range StoreSkuInfos { - homePage = HomePageInfos{ - StoreInfo: i, - StoreDeductionInfo: j, - StoreSkuInfo: k, + if i.StoreID == k.StoreID { + homePage.StoreSkuInfo = k } } } From 1c517285f91efb9a51391b7f897511339d7998a8 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 25 Aug 2022 15:29:24 +0800 Subject: [PATCH 3/7] home --- business/jxstore/cms/store.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index f5c5dfcaf..8ab0b7325 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -5810,10 +5810,10 @@ func GetHomePageByLocation(ctx *jxcontext.Context, lng, lat float64, needWalkDis if i.StoreID == j.StoreID { homePage.StoreDeductionInfo = j } - for _, k := range StoreSkuInfos { - if i.StoreID == k.StoreID { - homePage.StoreSkuInfo = k - } + } + for _, k := range StoreSkuInfos { + if i.StoreID == k.StoreID { + homePage.StoreSkuInfo = k } } homePages = append(homePages, homePage) From 39d3969bc7cd667aac0fbcff1e3b1323457a4dfe Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 25 Aug 2022 15:33:29 +0800 Subject: [PATCH 4/7] home --- business/jxstore/cms/store.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 8ab0b7325..77730a86b 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -159,9 +159,9 @@ type StoreSkuInfo struct { //首页展示信息 type HomePageInfos struct { - StoreInfo StoreInfo `json:"storeInfo"` - StoreDeductionInfo StoreDeductionInfo `json:"StoreDeductionInfo"` - StoreSkuInfo StoreSkuInfo `json:"StoreSkuInfo"` + StoreInfo StoreInfo `json:"storeInfo"` + StoreDeductionInfo []StoreDeductionInfo `json:"StoreDeductionInfo"` + StoreSkuInfo []StoreSkuInfo `json:"StoreSkuInfo"` } type JdStoreLevelExt struct { @@ -5808,12 +5808,12 @@ func GetHomePageByLocation(ctx *jxcontext.Context, lng, lat float64, needWalkDis homePage.StoreInfo = i for _, j := range storeDeductionInfos { if i.StoreID == j.StoreID { - homePage.StoreDeductionInfo = j + homePage.StoreDeductionInfo = append(homePage.StoreDeductionInfo, j) } } for _, k := range StoreSkuInfos { if i.StoreID == k.StoreID { - homePage.StoreSkuInfo = k + homePage.StoreSkuInfo = append(homePage.StoreSkuInfo, k) } } homePages = append(homePages, homePage) From 7fcd5e21145be3ab50d4ba47e68cf7305aa0f1f4 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 25 Aug 2022 16:00:20 +0800 Subject: [PATCH 5/7] home --- business/jxstore/cms/store.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 77730a86b..44a731f17 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -5805,15 +5805,23 @@ func GetHomePageByLocation(ctx *jxcontext.Context, lng, lat float64, needWalkDis } globals.SugarLogger.Debug("StoreSkuInfos=================", StoreSkuInfos) for _, i := range storeInfos { + //homePage = make(HomePageInfos, 0) + i := i homePage.StoreInfo = i for _, j := range storeDeductionInfos { + j := j if i.StoreID == j.StoreID { homePage.StoreDeductionInfo = append(homePage.StoreDeductionInfo, j) + } else { + continue } } for _, k := range StoreSkuInfos { + k := k if i.StoreID == k.StoreID { homePage.StoreSkuInfo = append(homePage.StoreSkuInfo, k) + } else { + continue } } homePages = append(homePages, homePage) From 804c862816a1522d77bee3bdfdd514f91f7d464b Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 25 Aug 2022 16:05:26 +0800 Subject: [PATCH 6/7] home --- business/jxstore/cms/store.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 44a731f17..ea1d8cbc0 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -5732,8 +5732,8 @@ func GetHomePageByLocation(ctx *jxcontext.Context, lng, lat float64, needWalkDis storeDeductionInfos []StoreDeductionInfo storeSkuInfo StoreSkuInfo StoreSkuInfos []StoreSkuInfo - homePage HomePageInfos - homePages []HomePageInfos + //homePage HomePageInfos + homePages []HomePageInfos ) locationList, err := common.GetStoreListByLocation(ctx, lng, lat, 20000, needWalkDistance, false, 0) if err != nil { @@ -5805,7 +5805,7 @@ func GetHomePageByLocation(ctx *jxcontext.Context, lng, lat float64, needWalkDis } globals.SugarLogger.Debug("StoreSkuInfos=================", StoreSkuInfos) for _, i := range storeInfos { - //homePage = make(HomePageInfos, 0) + homePage := HomePageInfos{} i := i homePage.StoreInfo = i for _, j := range storeDeductionInfos { From 98c3fecf95944060ce62f4307b4ba46579d090dc Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 26 Aug 2022 10:13:33 +0800 Subject: [PATCH 7/7] update --- business/jxstore/cms/store.go | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index ea1d8cbc0..a45fd31d8 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -5732,8 +5732,7 @@ func GetHomePageByLocation(ctx *jxcontext.Context, lng, lat float64, needWalkDis storeDeductionInfos []StoreDeductionInfo storeSkuInfo StoreSkuInfo StoreSkuInfos []StoreSkuInfo - //homePage HomePageInfos - homePages []HomePageInfos + homePages []HomePageInfos ) locationList, err := common.GetStoreListByLocation(ctx, lng, lat, 20000, needWalkDistance, false, 0) if err != nil { @@ -5782,11 +5781,8 @@ func GetHomePageByLocation(ctx *jxcontext.Context, lng, lat float64, needWalkDis storeDeductionInfos = append(storeDeductionInfos, storeDeductionInfo) } } - globals.SugarLogger.Debug("storeInfos============", storeInfos) - globals.SugarLogger.Debug("storeDeductionInfos=================", storeDeductionInfos) //获取热销商品 topSkusInfo, err := GetTopSkusByStoreIDs(ctx, storeID) - globals.SugarLogger.Debug("topSkusInfo==============", topSkusInfo) if err != nil { return nil, "获取热销商品失败", err } @@ -5803,7 +5799,6 @@ func GetHomePageByLocation(ctx *jxcontext.Context, lng, lat float64, needWalkDis } StoreSkuInfos = append(StoreSkuInfos, storeSkuInfo) } - globals.SugarLogger.Debug("StoreSkuInfos=================", StoreSkuInfos) for _, i := range storeInfos { homePage := HomePageInfos{} i := i @@ -5826,7 +5821,6 @@ func GetHomePageByLocation(ctx *jxcontext.Context, lng, lat float64, needWalkDis } homePages = append(homePages, homePage) } - globals.SugarLogger.Debug("homePages====================", homePages) } return homePages, "", nil }