From ab7e7eaca7918e027703b423fc8b5a1bf741a52f Mon Sep 17 00:00:00 2001
From: cb <275647614@qq.com>
Date: Wed, 30 Apr 2025 14:48:40 +0800
Subject: [PATCH] no message

---
 .../order/OrderMasterController.java          | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
index eecedf71..a0a9dc78 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
@@ -1306,8 +1306,7 @@ public class OrderMasterController extends BaseController {
             orderListResponse.setGoodsAreaList(goods.getGoodsAreaList());
             orderListResponse.setOrderMode(orderMaster.getOrderMode());
             orderListResponse.setIsCall(orderMaster.getIsCall());
-            orderListResponse.setAddress(orderMaster.getAddress());
-            logger.info("主单id{}，主单数据{}",request.getId(),orderMaster);
+            logger.info("主单id{}，主单数据{},省名字{},街道id{}",request.getId(),orderMaster,orderMaster.getProvinceName(),customerAddress.getStreetId());
             if (!StringUtils.isEmpty(orderMaster.getProvinceName())){
                 orderListResponse.setProvinceId(orderMaster.getProvinceId());
                 orderListResponse.setCityId(orderMaster.getCityId());
@@ -1321,17 +1320,23 @@ public class OrderMasterController extends BaseController {
                 orderListResponse.setStreetId(orderMaster.getStreetId());
                 orderListResponse.setStreetName(orderMaster.getStreetName());
             }else{
+                if (!StringUtils.isEmpty(customerAddress.getStreetId()+"")){
+                    String addressSysArea=sysArea.getMergerName();
+                    String[] array = addressSysArea.split(",");
+                    logger.info("单个订单查询到的地址{}",array);
+                    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(orderMaster.getStreetId());
                 orderListResponse.setAddress(customerAddress.getAddress());
                 orderListResponse.setPhone(customerAddress.getPhone());
                 orderListResponse.setName(customerAddress.getName());
-                orderListResponse.setProvinceName(customerAddress.getProvinceName());
-                orderListResponse.setCityName(customerAddress.getCityName());
-                orderListResponse.setCountryName(customerAddress.getCountryName());
-                orderListResponse.setStreetId(customerAddress.getStreetId());
-                orderListResponse.setStreetName(customerAddress.getStreetName());
+
             }
             logger.info("主单id{}，主单数据1{}",request.getId(),orderMaster);