From 185ebf7d10383ea1007abed5f73131ced64e9983 Mon Sep 17 00:00:00 2001 From: renyutian Date: Wed, 24 Apr 2019 13:41:27 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A5=BF=E7=99=BE=20=E9=83=A8=E5=88=86?= =?UTF-8?q?=E9=80=80=E6=AC=BE=E8=AE=A2=E5=8D=95=E6=BC=8F=E5=8D=95=EF=BC=8C?= =?UTF-8?q?=E5=8F=96=E9=94=99=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/model/order_financial.go | 3 ++- business/partner/purchase/ebai/financial.go | 4 +++- business/partner/purchase/jd/financial.go | 8 +++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/business/model/order_financial.go b/business/model/order_financial.go index a667749ed..3c63c0725 100644 --- a/business/model/order_financial.go +++ b/business/model/order_financial.go @@ -53,6 +53,7 @@ type OrderDiscountFinancial struct { VendorOrderID string `orm:"column(vendor_order_id);size(48)" json:"vendorOrderID"` // 订单ID VendorOrderID2 string `orm:"column(vendor_order_id2);size(48);index" json:"vendorOrderID2"` // 订单ID2,饿百独有 VendorActivityID string `orm:"column(vendor_activity_id);size(48)" json:"vendorActivityID"` // 活动ID 活动ID的存在，使原本的通过城市/下单时间-活动时间/金额……一系列匹配来确认活动归属的费时且准确度低的行为有了改变的可能--通过编码精确定位 + Type string `orm:"size(48)" json:"type"` // 活动type 美团订单存在不同的活动，活动ID是一样的，type不一样 如订单34399553040365354 // ActivityName string `orm:"size(255)" json:"activityName"` // 活动名 // ActivityMoney int64 `json:"activityMoney"` // 优惠金额 // Remark string `orm:"size(255)" json:"remark"` // 备注 @@ -61,7 +62,7 @@ type OrderDiscountFinancial struct { // 设置主键 "VendorOrderID", "DiscountCode", "VendorID" 一个订单不可能享受同一优惠2次 func (o *OrderDiscountFinancial) TableUnique() [][]string { return [][]string{ - []string{"VendorOrderID", "VendorActivityID", "VendorID"}, + []string{"VendorOrderID", "VendorActivityID", "Type", "VendorID"}, } } diff --git a/business/partner/purchase/ebai/financial.go b/business/partner/purchase/ebai/financial.go index 65b6870bd..01ea3a6d4 100644 --- a/business/partner/purchase/ebai/financial.go +++ b/business/partner/purchase/ebai/financial.go @@ -13,7 +13,8 @@ import ( func OnFinancialMsg(msg *ebaiapi.CallbackMsg) (err error) { if msg.Cmd == ebaiapi.CmdOrderPartRefund { // 部分退款处理 if utils.Int64ToStr(utils.MustInterface2Int64(msg.Body["status"])) == ebaiapi.OrderPartRefundSuccess { - orderData, err2 := api.EbaiAPI.OrderPartrefundGet(utils.Interface2String(msg.Body["refund_id"])) + afsOrderID := utils.Interface2String(msg.Body["order_id"]) + orderData, err2 := api.EbaiAPI.OrderPartrefundGet(afsOrderID) if err = err2; err == nil { afsOrder := CurPurchaseHandler.AfsOrderDetail2Financial(orderData) err = partner.CurOrderManager.SaveAfsOrderFinancialInfo(afsOrder) @@ -233,6 +234,7 @@ func (p *PurchaseHandler) OrderDetail2Financial(result map[string]interface{}) ( // ActivityName: utils.Interface2String(xMap["desc"]), // ActivityMoney: discountPrice, VendorActivityID: utils.Interface2String(xMap["activity_id"]), + Type: utils.Interface2String(xMap["type"]), } orderFinancial.Discounts = append(orderFinancial.Discounts, activity) // 通过活动Id去取，京西活动补贴 diff --git a/business/partner/purchase/jd/financial.go b/business/partner/purchase/jd/financial.go index be0d3c756..1c4fef6ba 100644 --- a/business/partner/purchase/jd/financial.go +++ b/business/partner/purchase/jd/financial.go @@ -99,6 +99,7 @@ func (p *PurchaseHandler) OrderDetail2Financial(orderData map[string]interface{} // 如果为自配送，自配送补贴=订单初始运费，远距离费=0 orderFinancial.SelfDeliveryDiscountMoney = utils.MustInterface2Int64(orderData["orderReceivableFreight"]) orderFinancial.DistanceFreightMoney = 0 + orderFinancial.FreightTipsMoney = 0 // 通过本地数据库去取是否转美团/达达，并计算运费 // wayBill, err2 := partner.CurOrderManager.LoadWaybill(orderFinancial.VendorOrderID, orderFinancial.VendorID) // if err = err2; err == nil { @@ -127,11 +128,12 @@ func (p *PurchaseHandler) OrderDetail2Financial(orderData map[string]interface{} if xMap["orderShareRatioData"] != nil { orderShareRatioData, _ := utils.HTTPBody2Values([]byte(utils.Interface2String(xMap["orderShareRatioData"])), false) activity := &model.OrderDiscountFinancial{ - VendorID: orderFinancial.VendorID, - VendorOrderID: orderFinancial.VendorOrderID, + VendorID: orderFinancial.VendorID, + VendorOrderID: orderFinancial.VendorOrderID, + VendorActivityID: utils.Interface2String(orderShareRatioData["promotionId"][0]), + Type: utils.Int64ToStr(int64(discountType)), // ActivityName: utils.Interface2String(xMap["discountName"]), // ActivityMoney: discountPrice, - VendorActivityID: utils.Interface2String(orderShareRatioData["promotionId"][0]), // Remark: utils.Interface2String(xMap["orderShareRatioData"]), } orderFinancial.Discounts = append(orderFinancial.Discounts, activity)