liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2022-12-22 19:30:13 +08:00
parent 593c7d3aea
commit e57eb1bb81
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
business/partner/purchase/jd/order.go
View File

@@ -76,7 +76,7 @@ func (c *PurchaseHandler) updateOrderFinancialInfo(a *jdapi.API, orderID string)
orderSettlement, err := a.OrderShoudSettlementService2(orderID) orderSettlement, err := a.OrderShoudSettlementService2(orderID)
if err == nil { if err == nil {
if orderSettlement != nil { if orderSettlement != nil {
updateOrderBySettleMent(order, orderSettlement) UpdateOrderBySettleMent(order, orderSettlement)
err = partner.CurOrderManager.UpdateOrderFields(order, []string{ /*"WaybillTipMoney", */ "TotalShopMoney", "PmSubsidyMoney", "NewEarningPrice"}) 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 { if partner.CurOrderManager.GetStatusDuplicatedCount(status) > 0 {
return nil 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 { if msg.MsgURL == jdapi.CallbackMsgOrderAccounting {
retVal = c.OnFinancialMsg(msg) retVal = c.OnFinancialMsg(msg)
retVal = jdapi.Err2CallbackResponse(c.updateOrderFinancialInfo(a, msg.BillID), status.VendorStatus) 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 return jdapi.SuccessResponse
} }
func updateOrderBySettleMent(order *model.GoodsOrder, orderSettlement *jdapi.OrderSettlementInfo) { func UpdateOrderBySettleMent(order *model.GoodsOrder, orderSettlement *jdapi.OrderSettlementInfo) {
if orderSettlement != nil { if orderSettlement != nil {
order.TotalShopMoney = orderSettlement.SettlementAmount order.TotalShopMoney = orderSettlement.SettlementAmount
order.PmSubsidyMoney = orderSettlement.PlatOrderGoodsDiscountMoney + orderSettlement.PlatSkuGoodsDiscountMoney order.PmSubsidyMoney = orderSettlement.PlatOrderGoodsDiscountMoney + orderSettlement.PlatSkuGoodsDiscountMoney
@@ -227,7 +236,7 @@ func (c *PurchaseHandler) getOrder(a *jdapi.API, orderID string) (order *model.G
task.Run() task.Run()
_, err = task.GetResult(0) _, err = task.GetResult(0)
if order != nil && orderSettlement != nil { if order != nil && orderSettlement != nil {
updateOrderBySettleMent(order, orderSettlement) UpdateOrderBySettleMent(order, orderSettlement)
err = partner.CurOrderManager.UpdateOrderFields(order, []string{"NewEarningPrice"}) err = partner.CurOrderManager.UpdateOrderFields(order, []string{"NewEarningPrice"})
} }
return order, orderMap, err return order, orderMap, err
@@ -451,7 +460,7 @@ func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bo
} }
if err == nil { if err == nil {
orderSettlement, _ := getAPI(order.VendorOrgCode).OrderShoudSettlementService2(order.VendorOrderID) orderSettlement, _ := getAPI(order.VendorOrgCode).OrderShoudSettlementService2(order.VendorOrderID)
updateOrderBySettleMent(order, orderSettlement) UpdateOrderBySettleMent(order, orderSettlement)
err = partner.CurOrderManager.UpdateOrderFields(order, []string{"NewEarningPrice"}) err = partner.CurOrderManager.UpdateOrderFields(order, []string{"NewEarningPrice"})
} }
return err return err