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

- up

Browse Source
This commit is contained in:
gazebo
2019-09-06 18:49:20 +08:00
parent ecaddecade
commit b1309e90ff
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/model/order.go
View File

@@ -27,7 +27,7 @@ type GoodsOrder struct {
SalePrice int64 `json:"salePrice"` // 售卖价 SalePrice int64 `json:"salePrice"` // 售卖价
ActualPayPrice int64 `json:"actualPayPrice"` // 单位为分 顾客实际支付 ActualPayPrice int64 `json:"actualPayPrice"` // 单位为分 顾客实际支付
TotalShopMoney int64 `json:"totalShopMoney"` // 应结金额-第三方平台结算给京西的金额（包括了所有的补贴，扣除） TotalShopMoney int64 `json:"totalShopMoney"` // 应结金额-第三方平台结算给京西的金额（包括了所有的补贴，扣除）
DiscountMoney int64 `json:"discountMoney"` // 订单级优惠金额 DiscountMoney int64 `json:"discountMoney"` // 订单总优惠金额
PmSubsidyMoney int64 `json:"pmSubsidyMoney"` // 平台活动补贴（订单主体活动补贴+订单单条sku补贴）1+ PmSubsidyMoney int64 `json:"pmSubsidyMoney"` // 平台活动补贴（订单主体活动补贴+订单单条sku补贴）1+
DistanceFreightMoney int64 `json:"distanceFreightMoney"` // 商户承担的远距离配送费（当前只有京东到家有值） DistanceFreightMoney int64 `json:"distanceFreightMoney"` // 商户承担的远距离配送费（当前只有京东到家有值）
WaybillTipMoney int64 `json:"waybillTipMoney"` // 京西加的平台配送小费 WaybillTipMoney int64 `json:"waybillTipMoney"` // 京西加的平台配送小费

5
business/partner/purchase/ebai/order.go
View File

@@ -118,8 +118,8 @@ func getZengSkus(orderID string, orderMan map[string]interface{}) (skus []*model
discounts, _ := orderMan["discount"].([]interface{}) discounts, _ := orderMan["discount"].([]interface{})
for _, v := range discounts { for _, v := range discounts {
discount := v.(map[string]interface{}) discount := v.(map[string]interface{})
discountMoney += utils.Interface2Int64WithDefault(discount["fee"], 0) discountType := utils.Interface2String(discount["type"])
if utils.Interface2String(discount["type"]) == ebaiapi.OrderSkuDiscountTypeZeng { if discountType == ebaiapi.OrderSkuDiscountTypeZeng {
sku := &model.OrderSku{ sku := &model.OrderSku{
VendorOrderID: orderID, VendorOrderID: orderID,
VendorID: model.VendorIDEBAI, VendorID: model.VendorIDEBAI,
@@ -131,6 +131,7 @@ func getZengSkus(orderID string, orderMan map[string]interface{}) (skus []*model
} }
skus = append(skus, sku) skus = append(skus, sku)
} }
discountMoney += utils.Interface2Int64WithDefault(discount["fee"], 0)
} }
return skus, discountMoney return skus, discountMoney
} }