diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index 307ef43a3..27c757710 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -1524,10 +1524,6 @@ func TransferJdsOrder(ctx *jxcontext.Context, vendorOrderID string, storeID int) } } } - err = jdshop.ChangeOrderStatus(vendorOrderID, model.OrderStatusCanceled, "订单转移被取消") - if err != nil { - return "", err - } //重新构建order的数据 storeMaps, err := dao.GetStoresMapList(db, []int{order.VendorID}, []int{storeID}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "") if err != nil || len(storeMaps) == 0 { @@ -1617,10 +1613,31 @@ func TransferJdsOrder(ctx *jxcontext.Context, vendorOrderID string, storeID int) if storeID != model.JdShopMainStoreID { order.DeliveryFlag = model.NO } + err = jdshop.ChangeOrderStatus(vendorOrderID, model.OrderStatusCanceled, "订单转移被取消") + if err != nil { + return "", err + } } else { order.VendorOrderID2 = order.VendorOrderID order.VendorOrderID = utils.Int64ToStr(jxutils.GenOrderNo()) order.DeliveryFlag = model.NO + orderStatus := &model.OrderStatus{ + VendorOrderID: vendorOrderID, + VendorID: model.VendorIDJX, + OrderType: model.OrderTypeOrder, + RefVendorOrderID: vendorOrderID, + RefVendorID: model.VendorIDJX, + VendorStatus: utils.Int2Str(model.OrderStatusCanceled), + Status: model.OrderStatusCanceled, + StatusTime: time.Now(), + Remark: "订单转移被取消", + } + jxutils.CallMsgHandlerAsync(func() { + err = partner.CurOrderManager.OnOrderStatusChanged("", orderStatus) + }, jxutils.ComposeUniversalOrderID(vendorOrderID, model.VendorIDJX)) + if err != nil { + return "", err + } } for _, sku := range skus { sku.VendorOrderID = order.VendorOrderID