liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/mark' into yonghui

Browse Source
This commit is contained in:
苏尹岚
2019-12-24 17:27:31 +08:00
parent ae043ed566 73763af5fe
commit afd3bbfea3
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxstore/act/act.go
View File

@@ -993,6 +993,8 @@ func ForceUpdateVendorPrice(ctx *jxcontext.Context, vendorID int, actType int, s
storeSkuBind.LastOperator = ctx.GetUserName() storeSkuBind.LastOperator = ctx.GetUserName()
storeSkuBindList = append(storeSkuBindList, storeSkuBind) storeSkuBindList = append(storeSkuBindList, storeSkuBind)
} }
} else if dao.IsNoRowsError(err) { // 忽略不存在错
err = nil
} else { } else {
errList.AddErr(fmt.Errorf("获取门店:%d商品:%d出错:%s", v.StoreID, v.SkuID, err)) errList.AddErr(fmt.Errorf("获取门店:%d商品:%d出错:%s", v.StoreID, v.SkuID, err))
} }

2
business/model/dao/store_sku.go
View File

@@ -1318,7 +1318,7 @@ func UpdateActPrice4StoreSkuNameNew(db *DaoDB, storeIDs, skuIDs []int, skuNamesI
v.EarningActID = actStoreSku.ActID v.EarningActID = actStoreSku.ActID
} else { } else {
earningPrice := int(jxutils.CaculateSkuEarningPrice(int64(v.BindPrice), int64(v.BindPrice), skuName.PayPercentage)) earningPrice := int(jxutils.CaculateSkuEarningPrice(int64(v.BindPrice), int64(v.BindPrice), skuName.PayPercentage))
if earningPrice < v.EbaiPrice { if earningPrice < v.EarningPrice {
v.EarningPrice = earningPrice v.EarningPrice = earningPrice
} }
} }

2
business/model/store_sku.go
View File

@@ -94,7 +94,7 @@ type StoreSkuBind struct {
Status int Status int
// ElmID int64 `orm:"column(elm_id);index"` // 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"` EbaiID int64 `orm:"column(ebai_id);index"`
// WscID int64 `orm:"column(wsc_id);index"` // 表示微盟skuId // WscID int64 `orm:"column(wsc_id);index"` // 表示微盟skuId
// WscID2 int64 `orm:"column(wsc_id2);index"` // 表示微盟goodsId // WscID2 int64 `orm:"column(wsc_id2);index"` // 表示微盟goodsId