Merge branch 'jdshop' of e.coding.net:rosydev/jx-callback into jdshop

business/partner/purchase/tiktok_store/order.go

@@ -587,13 +587,13 @@ func (c *PurchaseHandler) Swtich2SelfDeliver(order *model.GoodsOrder, userName s
 	if err2 != nil {
 		return err2
 	}
-
 	if remoteWaybill.ShipmentStatus >= tiktokShop.ShipmentStatusArrived { //骑手取货后不可取消
 		return errors.New("抖音配送骑手已取货,不可转门店自配送/三方配送")
 	}
-
-	if err := getAPI(order.VendorOrgCode, 0, "").ShopOrderDispatcher(utils.Str2Int64(order.VendorStoreID), order.VendorOrderID, tiktokShop.DispatcherFeeTypeCancel); err != nil {
-		return err
+	if len(remoteWaybill.TrackNo) != 0 { //存在运单
+		if err := getAPI(order.VendorOrgCode, 0, "").ShopOrderDispatcher(utils.Str2Int64(order.VendorStoreID), order.VendorOrderID, tiktokShop.DispatcherFeeTypeCancel); err != nil {
+			return err
+		}
 	}
 
 	//转门店自送通知抖音发货