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-11-19 17:47:10 +08:00
parent 7d739270de
commit 668c848572
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,8 +62,8 @@ var (
mtwmapi.OrderStatusDelivered: model.OrderStatusUnknown, // 以mtwmapi.OrderStatusFinished为结束状态，这个当成一个中间状态（且很少看到这个状态） mtwmapi.OrderStatusDelivered: model.OrderStatusUnknown, // 以mtwmapi.OrderStatusFinished为结束状态，这个当成一个中间状态（且很少看到这个状态）
mtwmapi.OrderStatusFinished: model.OrderStatusFinished, mtwmapi.OrderStatusFinished: model.OrderStatusFinished,
mtwmapi.OrderStatusCanceled: model.OrderStatusCanceled, mtwmapi.OrderStatusCanceled: model.OrderStatusCanceled,
mtwmapi.MsgTypeOrderModified: model.OrderStatusAdjust, // 用户调整订单 mtwmapi.MsgTypeOrderModified: model.OrderStatusAdjust, // 用户调整订单
//mtwmapi.MsgTypeOrderFinancial: model.OrderStatusUnknown, // 用户调整订单 mtwmapi.MsgTypeOrderFinancial: model.OrderStatusUnknown, // 订单结算
fakeFinishedPickup: model.OrderStatusFinishedPickup, fakeFinishedPickup: model.OrderStatusFinishedPickup,
fakeOrderAdjustFinished: model.OrderStatusAdjust, 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) { 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) result, err := getAPI(vendorOrgCode, 0, vendorStoreID).OrderGetOrderDetail(utils.Str2Int64(vendorOrderID), true)
if err == nil { if err == nil {
result[keyVendorOrgCode] = vendorOrgCode result[keyVendorOrgCode] = vendorOrgCode
order = p.Map2Order(result) order = p.Map2Order(result)
@@ -420,7 +421,6 @@ func (c *PurchaseHandler) onOrderMsg(msg *mtwmapi.CallbackMsg) (response *mtwmap
if status != nil { if status != nil {
var order *model.GoodsOrder var order *model.GoodsOrder
if order, err = partner.CurOrderManager.LoadOrder(GetOrderIDFromMsg(msg), model.VendorIDMTWM); err == nil { 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 { if status.Status == model.OrderStatusAdjust {
skuList, err2 := getRefundSkuDetailList(msg, order) skuList, err2 := getRefundSkuDetailList(msg, order)
if err = err2; err == nil { if err = err2; err == nil {