From cbb0368e1f5638e635a644987dff2cd4b2e73ee3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Mon, 3 Jul 2023 11:42:53 +0800
Subject: [PATCH] 1

---
 .../partner/purchase/tao_vegetable/order.go   | 26 +++++++++----------
 .../partner/purchase/tiktok_store/order.go    |  1 +
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/business/partner/purchase/tao_vegetable/order.go b/business/partner/purchase/tao_vegetable/order.go
index dd0759be9..fc003b4fd 100644
--- a/business/partner/purchase/tao_vegetable/order.go
+++ b/business/partner/purchase/tao_vegetable/order.go
@@ -14,7 +14,6 @@ import (
 	domain591 "git.rosy.net.cn/baseapi/platformapi/tao_vegetable/sdk/ability591/domain"
 	request591 "git.rosy.net.cn/baseapi/platformapi/tao_vegetable/sdk/ability591/request"
 	"git.rosy.net.cn/baseapi/platformapi/tao_vegetable/sdk/util"
-	"git.rosy.net.cn/baseapi/platformapi/tiktok_shop/ascription_place"
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
@@ -186,18 +185,19 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode string, vendorOrderID int64, ve
 			v.IsVendorAct = model.YES
 		}
 	}
-	// 抖音订单手机号和收货地址是否同城
-	order.PhoneAscription = ""
-	ascription, err := ascription_place.Find(order.ConsigneeMobile)
-	if err != nil {
-		order.PhoneAscription = model.PhoneAscriptionAddressNo + "-" + err.Error()
-	} else {
-		if strings.Contains(order.ConsigneeAddress, ascription.Province) && strings.Contains(order.ConsigneeAddress, ascription.City) {
-			order.PhoneAscription = model.PhoneAscriptionAddressYes + "-" + ascription.Province + ascription.City
-		} else {
-			order.PhoneAscription = model.PhoneAscriptionAddressNo + "-" + "归属信息不匹配:" + ascription.Province + ascription.City
-		}
-	}
+	// 抖音订单手机号和收货地址是否同城(虚拟号,无法获取到正确地址)
+	order.PhoneAscription = model.PhoneAscriptionAddressNo + "-" + "归属信息不匹配:" + "虚拟电话号码"
+	//ascription, err := ascription_place.Find(order.ConsigneeMobile)
+	//if err != nil {
+	//	order.PhoneAscription = model.PhoneAscriptionAddressNo + "-" + err.Error()
+	//	err = nil
+	//} else {
+	//	if strings.Contains(order.ConsigneeAddress, ascription.Province) && strings.Contains(order.ConsigneeAddress, ascription.City) {
+	//		order.PhoneAscription = model.PhoneAscriptionAddressYes + "-" + ascription.Province + ascription.City
+	//	} else {
+	//		order.PhoneAscription = model.PhoneAscriptionAddressNo + "-" + "归属信息不匹配:" + ascription.Province + ascription.City
+	//	}
+	//}
 
 	// 本地获取订单记录
 	orderSeq, _ := dao.GetVendorOrderNumber(dao.GetDB(), model.VendorIDTaoVegetable, order.VendorStoreID)
diff --git a/business/partner/purchase/tiktok_store/order.go b/business/partner/purchase/tiktok_store/order.go
index 67d7542ff..82a0d6653 100644
--- a/business/partner/purchase/tiktok_store/order.go
+++ b/business/partner/purchase/tiktok_store/order.go
@@ -227,6 +227,7 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s
 	ascription, err := ascription_place.Find(order.ConsigneeMobile)
 	if err != nil {
 		order.PhoneAscription = model.PhoneAscriptionAddressNo + "-" + err.Error()
+		err = nil
 	} else {
 		if strings.Contains(order.ConsigneeAddress, ascription.Province) && strings.Contains(order.ConsigneeAddress, ascription.City) {
 			order.PhoneAscription = model.PhoneAscriptionAddressYes + "-" + ascription.Province + ascription.City