From c28247e6b7f81dd7d475570314c386a3864e930c Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Mon, 23 Dec 2019 15:35:34 +0800
Subject: [PATCH] +GoodsOrder.BaseFreightMoney

---
 business/jxcallback/scheduler/defsch/defsch_ext.go | 2 +-
 business/model/order.go                            | 1 +
 business/partner/purchase/ebai/order.go            | 1 +
 business/partner/purchase/jd/order.go              | 1 +
 business/partner/purchase/mtwm/order.go            | 1 +
 5 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/business/jxcallback/scheduler/defsch/defsch_ext.go b/business/jxcallback/scheduler/defsch/defsch_ext.go
index 0681eb9e8..af13179b8 100644
--- a/business/jxcallback/scheduler/defsch/defsch_ext.go
+++ b/business/jxcallback/scheduler/defsch/defsch_ext.go
@@ -238,7 +238,7 @@ func (s *DefScheduler) QueryOrderWaybillFeeInfoEx(ctx *jxcontext.Context, vendor
 					if storeCourier.Status != model.StoreStatusOpened {
 						feeInfo = &partner.WaybillFeeInfo{
 							ErrCode: partner.WaybillFeeErrCodeCourierNotOpen,
-							ErrStr:  fmt.Sprintf("%d配送门店没有启用", storeCourier.VendorID),
+							ErrStr:  fmt.Sprintf("暂未开通，联系运营"),
 						}
 					} else {
 						if handler := partner.GetDeliveryPlatformFromVendorID(storeCourier.VendorID); handler != nil {
diff --git a/business/model/order.go b/business/model/order.go
index e785851b8..7c22bf59b 100644
--- a/business/model/order.go
+++ b/business/model/order.go
@@ -59,6 +59,7 @@ type GoodsOrder struct {
 	TotalShopMoney        int64      `json:"totalShopMoney"`       // 应结金额-第三方平台结算给京西的金额（包括了所有的补贴，扣除）
 	DiscountMoney         int64      `json:"discountMoney"`        // 订单总优惠金额
 	PmSubsidyMoney        int64      `json:"pmSubsidyMoney"`       // 平台活动补贴（订单主体活动补贴+订单单条sku补贴）1+
+	BaseFreightMoney      int64      `json:"baseFreightMoney"`     // 商户承担的配送费（不包括DistanceFreightMoney）
 	DistanceFreightMoney  int64      `json:"distanceFreightMoney"` // 商户承担的远距离配送费（当前只有京东到家有值）
 	WaybillTipMoney       int64      `json:"waybillTipMoney"`      // 京西加的平台配送小费
 	EarningPrice          int64      `json:"earningPrice"`         // 结算给门店老板的钱（未扣除可能的三方配送费）
diff --git a/business/partner/purchase/ebai/order.go b/business/partner/purchase/ebai/order.go
index 2a54cd1e7..af3773b66 100644
--- a/business/partner/purchase/ebai/order.go
+++ b/business/partner/purchase/ebai/order.go
@@ -206,6 +206,7 @@ func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo
 		OrderCreatedAt:        getTimeFromInterface(orderMap["create_time"]),
 		OriginalData:          string(utils.MustMarshal(result)),
 		ActualPayPrice:        utils.ForceInterface2Int64(orderMap["user_fee"]),
+		BaseFreightMoney:      utils.ForceInterface2Int64(result["send_fee"]),
 		TotalShopMoney:        utils.ForceInterface2Int64(orderMap["shop_fee"]),
 		DeliveryType:          mapDeliveryType(int(utils.ForceInterface2Int64(orderMap["delivery_party"]))),
 
diff --git a/business/partner/purchase/jd/order.go b/business/partner/purchase/jd/order.go
index 027916002..cd828982f 100644
--- a/business/partner/purchase/jd/order.go
+++ b/business/partner/purchase/jd/order.go
@@ -185,6 +185,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"]),
+		BaseFreightMoney:      utils.Interface2Int64WithDefault(result["orderBaseFreightMoney"], 0),
 		DistanceFreightMoney:  utils.Interface2Int64WithDefault(result["merchantPaymentDistanceFreightMoney"], 0),
 		DeliveryType:          deliveryTypeMap[int(utils.Str2Int64WithDefault(utils.Interface2String(result["deliveryCarrierNo"]), 0))],
 		VendorOrgCode:         utils.Interface2String(result["orgCode"]),
diff --git a/business/partner/purchase/mtwm/order.go b/business/partner/purchase/mtwm/order.go
index 32783632c..74d7d7e30 100644
--- a/business/partner/purchase/mtwm/order.go
+++ b/business/partner/purchase/mtwm/order.go
@@ -135,6 +135,7 @@ func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo
 		OrderCreatedAt:        getTimeFromTimestamp(utils.MustInterface2Int64(result["ctime"])),
 		OriginalData:          string(utils.MustMarshal(result)),
 		ActualPayPrice:        jxutils.StandardPrice2Int(utils.MustInterface2Float64(result["total"])),
+		BaseFreightMoney:      jxutils.StandardPrice2Int(utils.Interface2Float64WithDefault(result["shipping_fee"], 0)),
 
 		InvoiceTitle:   utils.Interface2String(result["invoice_title"]),
 		InvoiceTaxerID: utils.Interface2String(result["taxpayer_id"]),