From c8f65f20e71bd05f2dad91e6dec36c342114402e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Fri, 3 Feb 2023 14:32:40 +0800
Subject: [PATCH] 1

---
 .../partner/purchase/tiktok_store/order.go    | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/business/partner/purchase/tiktok_store/order.go b/business/partner/purchase/tiktok_store/order.go
index 6dfbd5d9b..41b016ff6 100644
--- a/business/partner/purchase/tiktok_store/order.go
+++ b/business/partner/purchase/tiktok_store/order.go
@@ -112,18 +112,7 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s
 	} else {
 		order.OrderFinishedAt = utils.DefaultTimeValue
 	}
-	//order.DeliveryType = model.OrderDeliveryTypeStoreSelf
-	autoTransport, err := GetStoreAutoCallRiderInfo(vendorOrgCode, []int64{utils.Str2Int64(vendorStoreID)})
-	if err != nil || len(autoTransport) == 0 {
-		order.DeliveryType = model.OrderDeliveryTypePlatform
-	} else {
-		switch autoTransport[utils.Str2Int64(vendorStoreID)].ServiceStatus {
-		case 1: // 1：关闭
-			order.DeliveryType = model.OrderDeliveryTypeStoreSelf
-		case 2: // 开启
-			order.DeliveryType = model.OrderDeliveryTypePlatform
-		}
-	}
+
 	order.Status = p.getStatusFromVendorStatus(result.OrderStatus)
 
 	if result.UserIdInfo != nil {
@@ -186,6 +175,19 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s
 	}
 	//order.TotalShopMoney = utils.Float64TwoInt64(float64(salePrice) * 0.95) // 抖音平台扣点金额0.05
 
+	//order.DeliveryType = model.OrderDeliveryTypeStoreSelf
+	autoTransport, err := GetStoreAutoCallRiderInfo(vendorOrgCode, []int64{utils.Str2Int64(vendorStoreIdRelly)})
+	if err != nil || len(autoTransport) == 0 {
+		order.DeliveryType = model.OrderDeliveryTypePlatform
+	} else {
+		switch autoTransport[utils.Str2Int64(vendorStoreID)].ServiceStatus {
+		case 1: // 1：关闭
+			order.DeliveryType = model.OrderDeliveryTypeStoreSelf
+		case 2: // 开启
+			order.DeliveryType = model.OrderDeliveryTypePlatform
+		}
+	}
+
 	// 预订单还是快速达
 	localStore, err := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), vendorStoreIdRelly, model.VendorIDDD, vendorOrgCode)
 	if err != nil || localStore == nil || localStore.ID == 0 {