This commit is contained in:
suyl
2021-05-31 14:56:38 +08:00
parent fbcc7ac754
commit 5acc738576
2 changed files with 32 additions and 25 deletions

View File

@@ -91,6 +91,7 @@ type StoreSkuBindInfo struct {
StatusSaleBegin int16 `json:"statusSaleBegin" validate:"max=2359,min=1,ltfield=StatusSaleEnd"` //商品可售时间范围
StatusSaleEnd int16 `json:"statusSaleEnd" validate:"max=2359,min=1"`
UPC string `json:"upc"`
MtLadderBoxPrice int `json:"mtLadderBoxPrice"`
Skus []*StoreSkuBindSkuInfo `json:"skus,omitempty"`
}
@@ -1602,6 +1603,11 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs
setStoreSkuBindStatus(skuBind, model.SyncFlagModifiedMask)
}
}
if skuBindInfo.MtLadderBoxPrice != 0 {
updateFieldMap["MtLadderBoxPrice"] = 1
skuBind.MtLadderBoxPrice = skuBindInfo.MtLadderBoxPrice
setStoreSkuBindStatus(skuBind, model.SyncFlagModifiedMask)
}
if skuBindInfo.UnitPrice != 0 && isCanChangePrice { // 这里是否需要加此条件限制
price := jxutils.CaculateSkuPrice(unitPrice, v.SpecQuality, v.SpecUnit, v.SkuNameUnit)
jxPrice := jxutils.CaculatePriceByPricePack(storeDetail.PricePercentagePackObj, int(storeDetail.PricePercentage), price)

View File

@@ -99,6 +99,7 @@ type GoodsOrder struct {
TotalShopMoney int64 `json:"totalShopMoney"` // 应结金额-第三方平台结算给京西的金额(包括了所有的补贴,扣除)
DiscountMoney int64 `json:"discountMoney"` // 订单总优惠金额
PmSubsidyMoney int64 `json:"pmSubsidyMoney"` // 平台活动补贴(订单主体活动补贴+订单单条sku补贴1+
//JxSubsidyMoney int64 `json:"jxSubsidyMoney"` // 京西我们自己填的订单补贴金额
BaseFreightMoney int64 `json:"baseFreightMoney"` // 商户承担的配送费不包括DistanceFreightMoney
DistanceFreightMoney int64 `json:"distanceFreightMoney"` // 商户承担的远距离配送费(当前只有京东到家有值)
WaybillTipMoney int64 `json:"waybillTipMoney"` // 京西加的平台配送小费