From 668c848572608724e3a42e01c816cc7867d8ebb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 19 Nov 2024 17:47:10 +0800 Subject: [PATCH] 1 --- business/partner/purchase/mtwm/order.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/business/partner/purchase/mtwm/order.go b/business/partner/purchase/mtwm/order.go index bc2bb7fce..8f1f83a99 100644 --- a/business/partner/purchase/mtwm/order.go +++ b/business/partner/purchase/mtwm/order.go @@ -62,8 +62,8 @@ var ( mtwmapi.OrderStatusDelivered: model.OrderStatusUnknown, // 以mtwmapi.OrderStatusFinished为结束状态，这个当成一个中间状态（且很少看到这个状态） mtwmapi.OrderStatusFinished: model.OrderStatusFinished, mtwmapi.OrderStatusCanceled: model.OrderStatusCanceled, - mtwmapi.MsgTypeOrderModified: model.OrderStatusAdjust, // 用户调整订单 - //mtwmapi.MsgTypeOrderFinancial: model.OrderStatusUnknown, // 用户调整订单 + mtwmapi.MsgTypeOrderModified: model.OrderStatusAdjust, // 用户调整订单 + mtwmapi.MsgTypeOrderFinancial: model.OrderStatusUnknown, // 订单结算 fakeFinishedPickup: model.OrderStatusFinishedPickup, fakeOrderAdjustFinished: model.OrderStatusAdjust, @@ -89,6 +89,7 @@ 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) + if err == nil { result[keyVendorOrgCode] = vendorOrgCode order = p.Map2Order(result) @@ -420,7 +421,6 @@ func (c *PurchaseHandler) onOrderMsg(msg *mtwmapi.CallbackMsg) (response *mtwmap if status != nil { var order *model.GoodsOrder if order, err = partner.CurOrderManager.LoadOrder(GetOrderIDFromMsg(msg), model.VendorIDMTWM); err == nil { - // if order, err = c.GetOrder(msg.AppID, GetOrderIDFromMsg(msg)); err == nil { if status.Status == model.OrderStatusAdjust { skuList, err2 := getRefundSkuDetailList(msg, order) if err = err2; err == nil {