From a5b8513eb5dfb653ae4c9f148d9a8a203fe8566d Mon Sep 17 00:00:00 2001 From: gazebo Date: Fri, 20 Sep 2019 11:22:46 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E9=A5=BF=E7=99=BE=E5=AF=B9=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E4=B9=9F=E8=AE=BE=E7=BD=AEdeliveryType?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/purchase/ebai/financial.go | 2 +- business/partner/purchase/ebai/order.go | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/business/partner/purchase/ebai/financial.go b/business/partner/purchase/ebai/financial.go index 66c13c6d6..f7109eb7f 100644 --- a/business/partner/purchase/ebai/financial.go +++ b/business/partner/purchase/ebai/financial.go @@ -195,7 +195,7 @@ func (p *PurchaseHandler) OrderDetail2Financial(result map[string]interface{}) ( orderFinancial.ReceivableFreight = utils.MustInterface2Int64(order1["send_fee"]) orderFinancial.DownFlag = int8(utils.MustInterface2Int64(order1["down_flag"])) - if int(getInt64FromInterface(order1["delivery_party"])) == ebaiapi.SendImmediatelySelf { + if int(getInt64FromInterface(order1["delivery_party"])) == ebaiapi.DeliveryPartyFengElmSelf { orderFinancial.SelfDeliveryDiscountMoney = orderFinancial.ReceivableFreight orderFinancial.DistanceFreightMoney = 0 // 通过本地数据库去取是否转美团/达达，并计算运费 diff --git a/business/partner/purchase/ebai/order.go b/business/partner/purchase/ebai/order.go index d7c4257d8..44e8a2590 100644 --- a/business/partner/purchase/ebai/order.go +++ b/business/partner/purchase/ebai/order.go @@ -56,8 +56,19 @@ var ( ebaiapi.OrderSkuDiscountTypeZhe: 1, ebaiapi.OrderSkuDiscountTypeReduce: 1, } + deliveryTypeMap = map[int]string{ + ebaiapi.DeliveryPartyFengElmSelf: model.OrderDeliveryTypeStoreSelf, + } ) +func mapDeliveryType(ebaiDeliveryParty int) (deliveryType string) { + deliveryType = deliveryTypeMap[ebaiDeliveryParty] + if deliveryType == "" { + deliveryType = model.OrderDeliveryTypePlatform + } + return deliveryType +} + func (p *PurchaseHandler) getStatusFromVendorStatus(vendorStatus string) int { if status, ok := VendorStatus2StatusMap[vendorStatus]; ok { return status @@ -190,6 +201,7 @@ func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo OriginalData: string(utils.MustMarshal(result)), ActualPayPrice: utils.ForceInterface2Int64(orderMap["user_fee"]), TotalShopMoney: utils.ForceInterface2Int64(orderMap["shop_fee"]), + DeliveryType: mapDeliveryType(int(utils.ForceInterface2Int64(orderMap["delivery_party"]))), } if utils.IsTimeZero(order.PickDeadline) && !utils.IsTimeZero(order.StatusTime) { order.PickDeadline = order.StatusTime.Add(pickupOrderDelay) // 饿百要求在5分钟内拣货，不然订单会被取消