From 913ba27fd3aa912054042a84e75a9de78e4d9331 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, 2 Feb 2024 17:00:04 +0800
Subject: [PATCH] 1

---
 business/jxcallback/scheduler/basesch/basesch.go     | 4 +++-
 business/jxcallback/scheduler/basesch/basesch_ext.go | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/business/jxcallback/scheduler/basesch/basesch.go b/business/jxcallback/scheduler/basesch/basesch.go
index 6a6bffd06..cf86b9617 100644
--- a/business/jxcallback/scheduler/basesch/basesch.go
+++ b/business/jxcallback/scheduler/basesch/basesch.go
@@ -235,7 +235,9 @@ func (c *BaseScheduler) CreateWaybill(platformVendorID int, order *model.GoodsOr
 				if storeDetail.IsService == model.YES && order.VendorID == model.VendorIDMTWM {
 					err = fmt.Errorf("京西ID:[%d],平台id[%s],平台[美团]:错误:[%s]", storeDetail.Store.ID, storeDetail.VendorStoreID, "此门店美团平台为服务商模式,不支持本系统提供的三方配送![仅美团,其余平台订单正常使用.]")
 				} else {
-
+					if order.VendorID == model.VendorIDEBAI && strings.Contains(order.ConsigneeAddress, EBaiOrderAddressHide) {
+						return nil, fmt.Errorf("由于饿了么用户数据隐私保护,发三方配送前请先将订单转为自配送,获取详情地址")
+					}
 					// 生成三方运单
 					bill, err = handlerInfo.Handler.CreateWaybill(order, maxDeliveryFee)
 					if err != nil {
diff --git a/business/jxcallback/scheduler/basesch/basesch_ext.go b/business/jxcallback/scheduler/basesch/basesch_ext.go
index cf29a1a80..bee3aea75 100644
--- a/business/jxcallback/scheduler/basesch/basesch_ext.go
+++ b/business/jxcallback/scheduler/basesch/basesch_ext.go
@@ -26,6 +26,10 @@ const (
 	autoSelfTakeCode = "135246"
 )
 
+const (
+	EBaiOrderAddressHide = "[隐私保护]顾客地址已隐藏"
+)
+
 func (c *BaseScheduler) CreateWaybillOnProviders(ctx *jxcontext.Context, order *model.GoodsOrder, courierVendorIDs, excludeCourierVendorIDs []int, maxDeliveryFee int64, createOnlyOne bool) (bills []*model.Waybill, err error) {
 	storeCourierList, err := dao.GetStoreCourierList2(dao.GetDB(), []int{jxutils.GetSaleStoreIDFromOrder(order)}, courierVendorIDs, model.StoreStatusOpened, []int{model.StoreAuditStatusOnline, model.StoreAuditStatusUpdated})
 	if err != nil {