From 930a9e3de8a05a7418d70a2d49d3b8c9bd05fb3b Mon Sep 17 00:00:00 2001
From: cb <275647614@qq.com>
Date: Wed, 30 Apr 2025 17:36:19 +0800
Subject: [PATCH] no message

---
 .../web/controller/order/OrderController.java | 34 +++++++++++++------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
index f17a17d8..97a44ca6 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
@@ -1593,17 +1593,31 @@ public class OrderController extends BaseController {
             }
             String addressSysArea = sysArea.getMergerName();
             String[] array = addressSysArea.split(",");
+            if (StringUtils.isEmpty(master.getProvinceName())){
+                orderListResponse.setProvinceName(array[0]);
+                orderListResponse.setCityName(array[1]);
+                orderListResponse.setCountryName(array[2]);
+                orderListResponse.setStreetName(array[3]);
+                orderListResponse.setProvinceId(customerAddress.getProvinceId());
+                orderListResponse.setCityId(customerAddress.getCityId());
+                orderListResponse.setCountryId(customerAddress.getCountryId());
+                orderListResponse.setStreetId(customerAddress.getStreetId());
+                orderListResponse.setPhone(customerAddress.getPhone());
+                orderListResponse.setName(customerAddress.getName());
+            }else{
+                orderListResponse.setProvinceName(master.getProvinceName());
+                orderListResponse.setCityName(master.getCityName());
+                orderListResponse.setCountryName(master.getCountryName());
+                orderListResponse.setStreetName(master.getStreetName());
+                orderListResponse.setProvinceId(master.getProvinceId());
+                orderListResponse.setCityId(master.getCityId());
+                orderListResponse.setCountryId(master.getCountryId());
+                orderListResponse.setStreetId(master.getStreetId());
+                orderListResponse.setPhone(master.getPhone());
+                orderListResponse.setName(master.getName());
+            }
+
 
-            orderListResponse.setProvinceName(array[0]);
-            orderListResponse.setCityName(array[1]);
-            orderListResponse.setCountryName(array[2]);
-            orderListResponse.setStreetName(array[3]);
-            orderListResponse.setProvinceId(customerAddress.getProvinceId());
-            orderListResponse.setCityId(customerAddress.getCityId());
-            orderListResponse.setCountryId(customerAddress.getCountryId());
-            orderListResponse.setStreetId(customerAddress.getStreetId());
-            orderListResponse.setPhone(customerAddress.getPhone());
-            orderListResponse.setName(customerAddress.getName());
             logger.info("所有的列表信息{}", orderListResponse);
             orderListResponses.add(orderListResponse);