From c45858e4e9c1c1156f84f61a0283374098b11daf Mon Sep 17 00:00:00 2001
From: lyb <yubing.lan@rosy.net.cn>
Date: Fri, 10 Aug 2018 10:17:21 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E4=BF=AE=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/controller/jd/order.go | 10 +---------
 business/model/const.go         |  2 --
 business/model/order.go         |  4 ++--
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/business/controller/jd/order.go b/business/controller/jd/order.go
index 681f693c1..9af2d6276 100644
--- a/business/controller/jd/order.go
+++ b/business/controller/jd/order.go
@@ -91,7 +91,6 @@ func (c *OrderController) GetOrder(orderID string) (order *model.GoodsOrder, err
 			ActualPayPrice:        utils.MustInterface2Int64(result["orderBuyerPayableMoney"]),
 			Skus:                  []*model.OrderSku{},
 		}
-
 		order.Status = c.GetStatusFromVendorStatus(order.VendorStatus)
 		businessTage := utils.Interface2String(result["businessTag"])
 		if strings.Index(businessTage, "dj_aging_immediately") >= 0 {
@@ -145,14 +144,7 @@ func (c *OrderController) GetOrder(orderID string) (order *model.GoodsOrder, err
 func setOrederDetailFee(result map[string]interface{}, order *model.GoodsOrder) {
 	order.BoxFee = utils.MustInterface2Int64(result["packagingMoney"])
 	order.PlatformFeeRate = model.JdPlatformFeeRate
-	var StoreFreightFee int64
-
-	if utils.Interface2String(result["deliveryCarrierNo"]) == model.NoJdDeliveryCarrierNo {
-		StoreFreightFee = 0
-	} else {
-		StoreFreightFee = utils.MustInterface2Int64(result["merchantPaymentDistanceFreightMoney"]) + utils.MustInterface2Int64(result["tips"])
-	}
-	order.BillStoreFreightFee = StoreFreightFee
+	order.BillStoreFreightFee = utils.MustInterface2Int64(result["merchantPaymentDistanceFreightMoney"]) + utils.MustInterface2Int64(result["tips"])
 }
 
 func setSkuDetailFee(skuPmFee int64, skuPmSubsidy int64, order *model.GoodsOrder, skuId int64) {
diff --git a/business/model/const.go b/business/model/const.go
index 8fa073eb3..93c64fbb1 100644
--- a/business/model/const.go
+++ b/business/model/const.go
@@ -126,8 +126,6 @@ const (
 
 var (
 	JdSkuPromotion = [10]int64{2, 3, 4, 1203, 6, 9998, 9997, 9996, 8, 8001}
-	//京东众包编号
-	NoJdDeliveryCarrierNo string = "2938"
 )
 
 const (
diff --git a/business/model/order.go b/business/model/order.go
index 705292902..8405f3375 100644
--- a/business/model/order.go
+++ b/business/model/order.go
@@ -46,9 +46,9 @@ type GoodsOrder struct {
 	ModelTimeInfo
 	OriginalData        string      `orm:"type(text)"`
 	Skus                []*OrderSku `orm:"-"`
-	SkuTotalPmFee       int64       //门店商品促销总支出
+	SkuPmFee            int64       //门店商品促销总支出
 	OrderPmFee          int64       //门店订单促销支出
-	SkuTotalPmSubsidy   int64       //平台商品促销总补贴
+	SkuPmSubsidy        int64       //平台商品促销总补贴
 	OrderPmSubsidy      int64       //平台订单促销补贴
 	BoxFee              int64       //餐盒费
 	PlatformFeeRate     int16       //平台费