From 64e2898769a2b86d04096dadd1616ffd1635f113 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Thu, 26 Mar 2020 10:23:37 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=A5=BF=E9=B2=9C=E8=BE=BEcookie=E6=9A=82?= =?UTF-8?q?=E6=97=B6=E5=B1=8F=E8=94=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/event/event.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/business/jxstore/event/event.go b/business/jxstore/event/event.go index 5cfd08385..a4d135f37 100644 --- a/business/jxstore/event/event.go +++ b/business/jxstore/event/event.go @@ -175,16 +175,16 @@ func GetCheckVendorCookie(ctx *jxcontext.Context, vendorIDs []int, isAuto bool) errMsg += fmt.Sprintf(" 饿百账号:[饿百后台饿鲜达全国账号]的Cookie无效了！", vv) flag = true } - result2, err2 := api.EbaiAPI.GetExianDaSkuDepot("190600741") - if err2 != nil || result2 == nil { - cc := &CheckCookie{} - cc.VendorID = v - cc.VendorOrgCode = "饿鲜达供应链系统" - cc.Status = "无效" - ccList = append(ccList, cc) - errMsg += fmt.Sprintf(" 饿百账号:[饿鲜达供应链系统]的Cookie无效了！", vv) - flag = true - } + // result2, err2 := api.EbaiAPI.GetExianDaSkuDepot("190600741") + // if err2 != nil || result2 == nil { + // cc := &CheckCookie{} + // cc.VendorID = v + // cc.VendorOrgCode = "饿鲜达供应链系统" + // cc.Status = "无效" + // ccList = append(ccList, cc) + // errMsg += fmt.Sprintf(" 饿百账号:[饿鲜达供应链系统]的Cookie无效了！", vv) + // flag = true + // } case model.VendorIDMTWM: _, err := api.MtwmAPI.PackagePriceGet(mtStoreID) if err != nil { From 3b0d5549858cd128805ca72334ed08261232cbea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Thu, 26 Mar 2020 14:12:38 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=95=86=E5=93=81=E5=BA=93=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=85=A8=E5=9B=BD=E4=B8=AD=E4=BD=8D=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/sku.go | 6 +++++- business/model/sku.go | 11 ++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go index c121a91b9..505d61c5a 100644 --- a/business/jxstore/cms/sku.go +++ b/business/jxstore/cms/sku.go @@ -392,9 +392,11 @@ func GetSkuNames(ctx *jxcontext.Context, keyword string, isBySku bool, params ma FROM sku_name t1 LEFT JOIN sku t2 ON t1.id = t2.name_id AND t2.deleted_at = ? LEFT JOIN sku_name_place_bind t3 ON t1.id = t3.name_id + LEFT JOIN price_refer_snapshot t4 ON t4.city_code = ? AND t4.snapshot_at = ? AND t4.sku_id = t2.id WHERE t1.deleted_at = ?` sqlParams := []interface{}{ utils.DefaultTimeValue, + 0, utils.Time2Date(time.Now().AddDate(0, 0, -1)), utils.DefaultTimeValue, } if keyword != "" { @@ -561,7 +563,8 @@ func GetSkuNames(ctx *jxcontext.Context, keyword string, isBySku bool, params ma t1.upc, t1.ex_prefix, t1.ex_prefix_begin, - t1.ex_prefix_end` + t1.ex_prefix_end, + t4.mid_unit_price` if isBySku { sql += `, t2.id` @@ -595,6 +598,7 @@ func GetSkuNames(ctx *jxcontext.Context, keyword string, isBySku bool, params ma t1.ex_prefix, t1.ex_prefix_begin, t1.ex_prefix_end, + t4.mid_unit_price, CONCAT("[", GROUP_CONCAT(DISTINCT CONCAT('{"id":', t2.id, ',"comment":"', t2.comment, '","status":', t2.status, ',"createdAt":"', CONCAT(REPLACE(t2.created_at," ","T"),"+08:00"), '","updatedAt":"', CONCAT(REPLACE(t2.updated_at," ","T"),"+08:00"), '","lastOperator":"', t2.last_operator, '","specQuality":', t2.spec_quality, ',"specUnit":"', t2.spec_unit, diff --git a/business/model/sku.go b/business/model/sku.go index ee2f66405..c2e224049 100644 --- a/business/model/sku.go +++ b/business/model/sku.go @@ -282,9 +282,10 @@ type SkuWithVendor struct { type SkuNameExt struct { SkuName - Skus []*SkuWithVendor `orm:"-" json:"skus"` - SkusStr string `json:"-"` - FullName string `json:"fullName"` - Places []int `orm:"-" json:"places"` - PlacesStr string `json:"-"` + Skus []*SkuWithVendor `orm:"-" json:"skus"` + SkusStr string `json:"-"` + FullName string `json:"fullName"` + Places []int `orm:"-" json:"places"` + PlacesStr string `json:"-"` + MidUnitPrice int `json:"midUnitPrice"` } From b0fdf7af1db6e31e97453bdf37f662ea97e0dd36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Mon, 30 Mar 2020 09:02:52 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=BB=8F=E7=BA=AC?= =?UTF-8?q?=E5=BA=A6=E6=9F=A5=E8=AF=A2=E9=97=A8=E5=BA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/store.go | 1 + 1 file changed, 1 insertion(+) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 7b15f1dcc..4eceff2d4 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -2399,6 +2399,7 @@ func GetStoreListByLocation(ctx *jxcontext.Context, lng, lat float64, needWalkDi jxutils.StandardCoordinate2Int(10000), jxutils.StandardCoordinate2Int(0), jxutils.StandardCoordinate2Int(10000), + model.YES, } dao.GetRows(dao.GetDB(), &storeList2, sql, sqlParams2...) if len(storeList2) > 1 {