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:
邹宗楠
2024-04-19 11:28:45 +08:00
parent d83ab8e37e
commit 3a3b24b942
7 changed files with 2 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -84,8 +84,6 @@ func (c *PurchaseHandler) updateOrderFinancialInfo(a *jdapi.API, orderID string)
}
func (c *PurchaseHandler) onOrderMsg(a *jdapi.API, msg *jdapi.CallbackOrderMsg) (retVal *jdapi.CallbackResponse) {
globals.SugarLogger.Debugf("==========onOrderMsg := %s", utils.Format4Output(msg, false))
// a := getAPI(vendorOrgCode)
if afsMsgMap[msg.MsgURL] {
retVal = c.OnAfsOrderMsg(a, msg)
} else {
@@ -103,8 +101,6 @@ func (c *PurchaseHandler) onOrderMsg(a *jdapi.API, msg *jdapi.CallbackOrderMsg)
} else {
// 新订单事件，与订单状态有点冲突
if jdapi.StatusIDNewOrder == msg.StatusID {
globals.SugarLogger.Debugf("==========onOrderMsg := %s", utils.Format4Output(msg, false))
globals.SugarLogger.Debugf("==========status := %s", utils.Format4Output(status, false))
retVal = c.onOrderNew(a, msg, status)
} else if jdapi.OrderStatusAdjust == msg.StatusID {
retVal = c.onOrderAdjust(a, msg, status)

3
business/partner/purchase/mtwm/order.go
View File

@@ -86,7 +86,6 @@ func (p *PurchaseHandler) getStatusFromVendorStatus(vendorStatus string) int {
func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID string) (order *model.GoodsOrder, orderMap map[string]interface{}, err error) {
result, err := getAPI(vendorOrgCode, 0, vendorStoreID).OrderGetOrderDetail(utils.Str2Int64(vendorOrderID), true)
globals.SugarLogger.Debugf("=====result2 := %s", utils.Format4Output(result, false))
if err == nil {
result[keyVendorOrgCode] = vendorOrgCode
order = p.Map2Order(result)
@@ -365,7 +364,7 @@ func (c *PurchaseHandler) onOrderMsg(msg *mtwmapi.CallbackMsg) (response *mtwmap
}
} else if msg.Cmd == mtwmapi.MsgTypeOrderModified {
order, result, err2 := c.getOrder(msg.AppID, GetOrderIDFromMsg(msg), GetVendorStoreIDFromMsg(msg))
globals.SugarLogger.Debugf("=====order := %s", utils.Format4Output(order, false))
globals.SugarLogger.Debugf("====order := %s", utils.Format4Output(order, false))
globals.SugarLogger.Debugf("=====result := %s", utils.Format4Output(result, false))
if err = err2; err == nil {
localOrder, _ := partner.CurOrderManager.LoadOrder(GetOrderIDFromMsg(msg), model.VendorIDMTWM)