From 80854d6d5bb31fbb6ef3f460402d12849a8b7122 Mon Sep 17 00:00:00 2001
From: richboo111 <yangsiqi1376@163.com>
Date: Thu, 11 Jan 2024 16:59:04 +0800
Subject: [PATCH] 1

---
 business/partner/delivery/uupt/waybill.go | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/business/partner/delivery/uupt/waybill.go b/business/partner/delivery/uupt/waybill.go
index ed194c67f..543575426 100644
--- a/business/partner/delivery/uupt/waybill.go
+++ b/business/partner/delivery/uupt/waybill.go
@@ -327,9 +327,23 @@ func getOrderPrice(order *model.GoodsOrder) (orderPrice *uuptapi.GetOrderPriceRe
 	} else {
 		tempWeight = int(order.Weight / 1000)
 	}
+
+	//地址特殊判断
+	cityName := store.CityName
+	districtName := store.DistrictName
+	address := ""
+	if !strings.Contains(store.Address, cityName) { //城市
+		address += cityName
+	}
+	if !strings.Contains(store.Address, districtName) { //行政区
+		address += districtName
+	}
+	address += store.Address
+	globals.SugarLogger.Debugf("uupt test address=%s", address)
+
 	param := map[string]interface{}{
 		"origin_id":     order.VendorOrderID,
-		"from_address":  store.Address,
+		"from_address":  address,
 		"from_usernote": "京西菜市(" + store.Store.Name + ")",
 		"to_address":    order.ConsigneeAddress,
 		"city_name":     store.CityName,