From 26bfe04b7bcfa803683de180b6080d6a25785cf2 Mon Sep 17 00:00:00 2001 From: gazebo Date: Tue, 24 Dec 2019 14:45:33 +0800 Subject: [PATCH 1/3] up --- business/model/dao/store_sku.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go index 469b16567..bd832e69a 100644 --- a/business/model/dao/store_sku.go +++ b/business/model/dao/store_sku.go @@ -1282,7 +1282,7 @@ func UpdateActPrice4StoreSkuNameNew(db *DaoDB, storeIDs, skuIDs []int, skuNamesI v.EarningActID = actStoreSku.ActID } else { earningPrice := int(jxutils.CaculateSkuEarningPrice(int64(v.BindPrice), int64(v.BindPrice), skuName.PayPercentage)) - if earningPrice < v.EbaiPrice { + if earningPrice < v.EarningPrice { v.EarningPrice = earningPrice } } From 9a76d078687d4d283e321d9d8b5e0cf301fb3912 Mon Sep 17 00:00:00 2001 From: gazebo Date: Tue, 24 Dec 2019 15:29:07 +0800 Subject: [PATCH 2/3] =?UTF-8?q?StoreSkuBind.MtwmID=E5=BB=BA=E7=B4=A2?= =?UTF-8?q?=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/model/store_sku.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/model/store_sku.go b/business/model/store_sku.go index 8a81ec9cb..49aebbbc6 100644 --- a/business/model/store_sku.go +++ b/business/model/store_sku.go @@ -94,7 +94,7 @@ type StoreSkuBind struct { Status int // ElmID int64 `orm:"column(elm_id);index"` - MtwmID int64 `orm:"column(mtwm_id)"` + MtwmID int64 `orm:"column(mtwm_id);index"` EbaiID int64 `orm:"column(ebai_id);index"` // WscID int64 `orm:"column(wsc_id);index"` // 表示微盟skuId // WscID2 int64 `orm:"column(wsc_id2);index"` // 表示微盟goodsId From 5ef3893f481e8c899760e78a2043b2028c96421e Mon Sep 17 00:00:00 2001 From: gazebo Date: Tue, 24 Dec 2019 16:29:31 +0800 Subject: [PATCH 3/3] =?UTF-8?q?ForceUpdateVendorPrice=E4=B8=AD=E5=BF=BD?= =?UTF-8?q?=E7=95=A5=E4=B8=8D=E5=AD=98=E5=9C=A8=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/act/act.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/business/jxstore/act/act.go b/business/jxstore/act/act.go index b8c96d08b..f53fc1247 100644 --- a/business/jxstore/act/act.go +++ b/business/jxstore/act/act.go @@ -993,6 +993,8 @@ func ForceUpdateVendorPrice(ctx *jxcontext.Context, vendorID int, actType int, s storeSkuBind.LastOperator = ctx.GetUserName() storeSkuBindList = append(storeSkuBindList, storeSkuBind) } + } else if dao.IsNoRowsError(err) { // 忽略不存在错 + err = nil } else { errList.AddErr(fmt.Errorf("获取门店:%d商品:%d出错:%s", v.StoreID, v.SkuID, err)) }