From 9c37dd84fc7620dfc1cbe3516d23c5369f823dd9 Mon Sep 17 00:00:00 2001 From: gazebo Date: Thu, 28 Nov 2019 15:01:44 +0800 Subject: [PATCH 1/2] remove SkuCategory.ElmCategoryID and WscCategoryID --- business/model/sku.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/business/model/sku.go b/business/model/sku.go index cc8036ce2..70a727723 100644 --- a/business/model/sku.go +++ b/business/model/sku.go @@ -138,10 +138,10 @@ type SkuCategory struct { EbaiCategoryID int64 `orm:"column(ebai_category_id)" json:"ebaiCategoryID"` // 这个是指对应的饿百商品类别 MtwmCategoryID int64 `orm:"column(mtwm_category_id)" json:"mtwmCategoryID"` // 这个是指对应的美团外卖商品类别 - ElmCategoryID int64 `orm:"column(elm_category_id)" json:"elmCategoryID"` // 这个是指对应的饿了么商品类别 - WscCategoryID int64 `orm:"column(wsc_category_id)" json:"wscCategoryID"` // 这个是指对应的美团外卖商品类别 + // ElmCategoryID int64 `orm:"column(elm_category_id)" json:"elmCategoryID"` // 这个是指对应的饿了么商品类别 + // WscCategoryID int64 `orm:"column(wsc_category_id)" json:"wscCategoryID"` // 这个是指对应的美团外卖商品类别 - JdID int64 `orm:"column(jd_id);null" json:"jdID"` // 这个是指商家自己的商品类别在京东平台上的ID + JdID int64 `orm:"column(jd_id)" json:"jdID"` // 这个是指商家自己的商品类别在京东平台上的ID JdSyncStatus int8 `orm:"default(2)" json:"jdSyncStatus"` } From 406b522d05f6b1f306e796d5e5c325c4f72e12c8 Mon Sep 17 00:00:00 2001 From: gazebo Date: Thu, 28 Nov 2019 15:52:36 +0800 Subject: [PATCH 2/2] =?UTF-8?q?ForceUpdateVendorPrice=E6=89=BE=E4=B8=8D?= =?UTF-8?q?=E5=88=B0=E9=97=A8=E5=BA=97=E5=95=86=E5=93=81=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E7=BB=99=E5=87=BA=E5=85=B7=E4=BD=93=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/act/act.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/jxstore/act/act.go b/business/jxstore/act/act.go index 89dfe7fe3..0b1d54a1e 100644 --- a/business/jxstore/act/act.go +++ b/business/jxstore/act/act.go @@ -981,7 +981,7 @@ func ForceUpdateVendorPrice(ctx *jxcontext.Context, vendorID int, actType int, s storeSkuBindList = append(storeSkuBindList, storeSkuBind) } } else { - errList.AddErr(err) + errList.AddErr(fmt.Errorf("获取门店:%d商品:%d出错:%s", v.StoreID, v.SkuID, err)) } } if err = errList.GetErrListAsOne(); err != nil {