From e57eb1bb8188014668a0d45b6f51fa1dc447607a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 22 Dec 2022 19:30:13 +0800 Subject: [PATCH 1/3] 1 --- business/partner/purchase/jd/order.go | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/business/partner/purchase/jd/order.go b/business/partner/purchase/jd/order.go index 3f355e37d..e8078dc2b 100644 --- a/business/partner/purchase/jd/order.go +++ b/business/partner/purchase/jd/order.go @@ -76,7 +76,7 @@ func (c *PurchaseHandler) updateOrderFinancialInfo(a *jdapi.API, orderID string) orderSettlement, err := a.OrderShoudSettlementService2(orderID) if err == nil { if orderSettlement != nil { - updateOrderBySettleMent(order, orderSettlement) + UpdateOrderBySettleMent(order, orderSettlement) err = partner.CurOrderManager.UpdateOrderFields(order, []string{ /*"WaybillTipMoney", */ "TotalShopMoney", "PmSubsidyMoney", "NewEarningPrice"}) } } @@ -95,6 +95,15 @@ func (c *PurchaseHandler) onOrderMsg(a *jdapi.API, msg *jdapi.CallbackOrderMsg) if partner.CurOrderManager.GetStatusDuplicatedCount(status) > 0 { return nil } + + // 可能没啥用,更主要是想更新订单的结算价 + if status.Status == model.OrderStatusFinishedPickup { + order, _, _ := c.getOrder(a, msg.BillID) + orderSettlement, _ := a.OrderShoudSettlementService2(status.VendorOrderID) + UpdateOrderBySettleMent(order, orderSettlement) + partner.CurOrderManager.UpdateOrderFields(order, []string{"NewEarningPrice"}) + } + if msg.MsgURL == jdapi.CallbackMsgOrderAccounting { retVal = c.OnFinancialMsg(msg) retVal = jdapi.Err2CallbackResponse(c.updateOrderFinancialInfo(a, msg.BillID), status.VendorStatus) @@ -174,7 +183,7 @@ func (c *PurchaseHandler) onOrderInfoChangeMsg(vendorOrgCode string, msg *jdapi. return jdapi.SuccessResponse } -func updateOrderBySettleMent(order *model.GoodsOrder, orderSettlement *jdapi.OrderSettlementInfo) { +func UpdateOrderBySettleMent(order *model.GoodsOrder, orderSettlement *jdapi.OrderSettlementInfo) { if orderSettlement != nil { order.TotalShopMoney = orderSettlement.SettlementAmount order.PmSubsidyMoney = orderSettlement.PlatOrderGoodsDiscountMoney + orderSettlement.PlatSkuGoodsDiscountMoney @@ -227,7 +236,7 @@ func (c *PurchaseHandler) getOrder(a *jdapi.API, orderID string) (order *model.G task.Run() _, err = task.GetResult(0) if order != nil && orderSettlement != nil { - updateOrderBySettleMent(order, orderSettlement) + UpdateOrderBySettleMent(order, orderSettlement) err = partner.CurOrderManager.UpdateOrderFields(order, []string{"NewEarningPrice"}) } return order, orderMap, err @@ -451,7 +460,7 @@ func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bo } if err == nil { orderSettlement, _ := getAPI(order.VendorOrgCode).OrderShoudSettlementService2(order.VendorOrderID) - updateOrderBySettleMent(order, orderSettlement) + UpdateOrderBySettleMent(order, orderSettlement) err = partner.CurOrderManager.UpdateOrderFields(order, []string{"NewEarningPrice"}) } return err From b342dd39c13b178a151af97216601b5bf50f129c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 22 Dec 2022 19:32:30 +0800 Subject: [PATCH 2/3] 1 --- business/partner/purchase/jd/order.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/business/partner/purchase/jd/order.go b/business/partner/purchase/jd/order.go index e8078dc2b..e286aa670 100644 --- a/business/partner/purchase/jd/order.go +++ b/business/partner/purchase/jd/order.go @@ -98,10 +98,9 @@ func (c *PurchaseHandler) onOrderMsg(a *jdapi.API, msg *jdapi.CallbackOrderMsg) // 可能没啥用,更主要是想更新订单的结算价 if status.Status == model.OrderStatusFinishedPickup { - order, _, _ := c.getOrder(a, msg.BillID) - orderSettlement, _ := a.OrderShoudSettlementService2(status.VendorOrderID) - UpdateOrderBySettleMent(order, orderSettlement) - partner.CurOrderManager.UpdateOrderFields(order, []string{"NewEarningPrice"}) + order2, _, err := c.getOrder(a, msg.BillID) + globals.SugarLogger.Debugf("==京东结算价 %s", utils.Format4Output(err, false)) + globals.SugarLogger.Debugf("==京东结算价order2 %s", utils.Format4Output(order2, false)) } if msg.MsgURL == jdapi.CallbackMsgOrderAccounting { From 5d410fbb593b71c5c88befa828d77bb241f666cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 23 Dec 2022 10:32:43 +0800 Subject: [PATCH 3/3] 1 --- business/partner/purchase/jd/order.go | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/business/partner/purchase/jd/order.go b/business/partner/purchase/jd/order.go index e286aa670..b53a21d67 100644 --- a/business/partner/purchase/jd/order.go +++ b/business/partner/purchase/jd/order.go @@ -96,13 +96,6 @@ func (c *PurchaseHandler) onOrderMsg(a *jdapi.API, msg *jdapi.CallbackOrderMsg) return nil } - // 可能没啥用,更主要是想更新订单的结算价 - if status.Status == model.OrderStatusFinishedPickup { - order2, _, err := c.getOrder(a, msg.BillID) - globals.SugarLogger.Debugf("==京东结算价 %s", utils.Format4Output(err, false)) - globals.SugarLogger.Debugf("==京东结算价order2 %s", utils.Format4Output(order2, false)) - } - if msg.MsgURL == jdapi.CallbackMsgOrderAccounting { retVal = c.OnFinancialMsg(msg) retVal = jdapi.Err2CallbackResponse(c.updateOrderFinancialInfo(a, msg.BillID), status.VendorStatus) @@ -236,7 +229,7 @@ func (c *PurchaseHandler) getOrder(a *jdapi.API, orderID string) (order *model.G _, err = task.GetResult(0) if order != nil && orderSettlement != nil { UpdateOrderBySettleMent(order, orderSettlement) - err = partner.CurOrderManager.UpdateOrderFields(order, []string{"NewEarningPrice"}) + err = partner.CurOrderManager.UpdateOrderFields(order, []string{"NewEarningPrice", "TotalShopMoney"}) } return order, orderMap, err }