diff --git a/business/model/api_config.go b/business/model/api_config.go index 1eb9f795c..585369c0f 100644 --- a/business/model/api_config.go +++ b/business/model/api_config.go @@ -45,6 +45,8 @@ const ( VendorIDAutonavi = 321 // 高德导航 VendorIDQiNiuCloud = 323 // 七牛云 VendorIDShowAPI = 325 // 万维易源 + + VendorIDJDWL = 401 //京东物流 ) type VendorInfo struct { @@ -95,6 +97,7 @@ var ( VendorIDDada: "达达众包", VendorIDMTPS: "美团配送", + VendorIDJDWL: "京东物流", VendorIDFeiE: "飞鹅", VendorIDXiaoWM: "外卖管家", diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go index de411194d..c39c2f141 100644 --- a/business/partner/purchase/jx/localjx/order.go +++ b/business/partner/purchase/jx/localjx/order.go @@ -572,7 +572,10 @@ func jxOrder2GoodsOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, deliveryAd } order.TotalShopMoney += jxOrder.FreightPrice order.ActualPayPrice = order.TotalShopMoney - order.FromStoreID = jxOrder.FromStoreID + if jxOrder.FromStoreID != 0 { + order.FromStoreID = jxOrder.FromStoreID + order.WaybillVendorID = model.VendorIDJDWL + } return order, err }