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)) } diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go index 542db6533..89c43e16d 100644 --- a/business/model/dao/store_sku.go +++ b/business/model/dao/store_sku.go @@ -1318,7 +1318,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 } } 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