From 89b9906d2c14318cb030fe46bb33b25b6d69629d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Tue, 26 Sep 2023 09:38:51 +0800
Subject: [PATCH] 1

---
 business/partner/purchase/mtwm/order_afs.go     | 1 +
 business/partner/purchase/tiktok_store/order.go | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/business/partner/purchase/mtwm/order_afs.go b/business/partner/purchase/mtwm/order_afs.go
index a64fd0441..c8cafd921 100644
--- a/business/partner/purchase/mtwm/order_afs.go
+++ b/business/partner/purchase/mtwm/order_afs.go
@@ -160,6 +160,7 @@ func (c *PurchaseHandler) onAfsOrderMsg(msg *mtwmapi.CallbackMsg) (retVal *mtwma
 
 			// 新订单平台自动同意退单,某一些情况下产生的运单没退!这个处理一下!
 			//if refundData.NotifyType == mtwmapi.MsgTypeOrderAgree && (msg.Cmd == mtwmapi.MsgTypeOrderRefund || msg.Cmd == mtwmapi.MsgTypeOrderAgree) {
+			//	partner.CurOrderManager.+
 			//	defsch.FixedScheduler.CancelAll3rdWaybills(jxcontext.AdminCtx, orderStatus.RefVendorOrderID, orderStatus.VendorID, true)
 			//}
 		}
diff --git a/business/partner/purchase/tiktok_store/order.go b/business/partner/purchase/tiktok_store/order.go
index 0b44431da..227c1b344 100644
--- a/business/partner/purchase/tiktok_store/order.go
+++ b/business/partner/purchase/tiktok_store/order.go
@@ -984,15 +984,17 @@ func (c *PurchaseHandler) CancelLogisticsByWmOrderId(order *model.GoodsOrder, re
 }
 
 // OrderLogisticsStatus 获取订单配送状态
-func (c *PurchaseHandler) OrderLogisticsStatus(orderId string) (*utils.RiderInfo, error) {
+func (c *PurchaseHandler) OrderLogisticsStatus(orderId string) (data *utils.RiderInfo, err error) {
 	orderInfo, err := dao.GetSimpleOrder(dao.GetDB(), orderId)
 	if err != nil {
-		return nil, errors.New("获取本地门店账号信息失败，请重试")
+		data.LogisticsStatus = 0
+		return data, errors.New("获取本地门店账号信息失败，请重试")
 	}
 
 	waybill, err := getAPI(orderInfo.VendorOrgCode, 0, "").GetShipmentInfo(utils.Str2Int64(orderInfo.VendorOrderID), 0, tiktokShop.ShipmentTypeInvoice)
 	if err != nil {
-		return nil, err
+		data.LogisticsStatus = 0
+		return data, err
 	}
 
 	result := &utils.RiderInfo{