From 89c7ab2d4465d6d636dbb42fbba6726980a459fe Mon Sep 17 00:00:00 2001 From: gazebo Date: Thu, 25 Jul 2019 10:45:45 +0800 Subject: [PATCH] =?UTF-8?q?+=20=E6=B7=BB=E5=8A=A0GoodsOrder.DistanceFreigh?= =?UTF-8?q?tMoney,=20=E5=95=86=E6=88=B7=E6=89=BF=E6=8B=85=E7=9A=84?= =?UTF-8?q?=E8=BF=9C=E8=B7=9D=E7=A6=BB=E9=85=8D=E9=80=81=E8=B4=B9=EF=BC=88?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E5=8F=AA=E6=9C=89=E4=BA=AC=E4=B8=9C=E5=88=B0?= =?UTF-8?q?=E5=AE=B6=E6=9C=89=E5=80=BC=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/model/order.go | 17 +++++++++-------- business/partner/purchase/jd/order.go | 1 + 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/business/model/order.go b/business/model/order.go index 81d3a41db..73807c7a9 100644 --- a/business/model/order.go +++ b/business/model/order.go @@ -16,14 +16,15 @@ type GoodsOrder struct { StoreID int `orm:"column(store_id)" json:"storeID"` // 外部系统里记录的 jxstoreid JxStoreID int `orm:"column(jx_store_id)" json:"jxStoreID"` // 根据VendorStoreID在本地系统里查询出来的 jxstoreid StoreName string `orm:"size(64)" json:"storeName"` - ShopPrice int64 `json:"shopPrice"` // 京西价 - VendorPrice int64 `json:"vendorPrice"` // 平台价 - SalePrice int64 `json:"salePrice"` // 售卖价 - ActualPayPrice int64 `json:"actualPayPrice"` // 单位为分 顾客实际支付 - TotalShopMoney int64 `json:"totalShopMoney"` // 应结金额-第三方平台结算给京西的金额（包括了所有的补贴，扣除） - PmSubsidyMoney int64 `json:"pmSubsidyMoney"` // 平台活动补贴（订单主体活动补贴+订单单条sku补贴）1+ - EarningPrice int64 `json:"earningPrice"` // 结算给门店老板的钱（未扣除可能的三方配送费） - Weight int `json:"weight"` // 单位为克 + ShopPrice int64 `json:"shopPrice"` // 京西价 + VendorPrice int64 `json:"vendorPrice"` // 平台价 + SalePrice int64 `json:"salePrice"` // 售卖价 + ActualPayPrice int64 `json:"actualPayPrice"` // 单位为分 顾客实际支付 + TotalShopMoney int64 `json:"totalShopMoney"` // 应结金额-第三方平台结算给京西的金额（包括了所有的补贴，扣除） + PmSubsidyMoney int64 `json:"pmSubsidyMoney"` // 平台活动补贴（订单主体活动补贴+订单单条sku补贴）1+ + DistanceFreightMoney int64 `json:"distanceFreightMoney"` // 商户承担的远距离配送费（当前只有京东到家有值） + EarningPrice int64 `json:"earningPrice"` // 结算给门店老板的钱（未扣除可能的三方配送费） + Weight int `json:"weight"` // 单位为克 ConsigneeName string `orm:"size(32)" json:"consigneeName"` ConsigneeMobile string `orm:"size(32)" json:"consigneeMobile"` ConsigneeMobile2 string `orm:"size(32)" json:"consigneeMobile2"` diff --git a/business/partner/purchase/jd/order.go b/business/partner/purchase/jd/order.go index b64eb3710..0a4b38276 100644 --- a/business/partner/purchase/jd/order.go +++ b/business/partner/purchase/jd/order.go @@ -178,6 +178,7 @@ func (c *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo OrderCreatedAt: utils.Str2Time(result[statusTimeField].(string)), OriginalData: string(utils.MustMarshal(result)), ActualPayPrice: utils.MustInterface2Int64(result["orderBuyerPayableMoney"]), + DistanceFreightMoney: utils.Interface2Int64WithDefault(result["merchantPaymentDistanceFreightMoney"], 0), } order.Status = c.getStatusFromVendorStatus(order.VendorStatus) businessTage := utils.Interface2String(result["businessTag"])