From 3ef7b08c95cfebac92be47715f47a2f701aaa4a7 Mon Sep 17 00:00:00 2001
From: cb <275647614@qq.com>
Date: Thu, 24 Apr 2025 09:55:58 +0800
Subject: [PATCH] no message

---
 .../order/OrderMasterController.java          | 13 +++++++++++
 .../ghy/web/pojo/vo/OrderListResponse.java    | 22 +++++++++++++++++++
 2 files changed, 35 insertions(+)

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 5926e768..5270089d 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,6 +1306,19 @@ public class OrderMasterController extends BaseController {
             orderListResponse.setGoodsAreaList(goods.getGoodsAreaList());
             orderListResponse.setOrderMode(orderMaster.getOrderMode());
             orderListResponse.setIsCall(orderMaster.getIsCall());
+            orderListResponse.setAddress(orderMaster.getAddress());
+
+            orderListResponse.setProvinceId(customerAddress.getProvinceId());
+            orderListResponse.setCityId(customerAddress.getCityId());
+            orderListResponse.setCountryId(customerAddress.getCountryId());
+            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());
 
             return AjaxResult.success(orderListResponse);
         } catch (Exception e) {
diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java
index 84d716df..73a4d346 100644
--- a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java
+++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java
@@ -176,4 +176,26 @@ public class OrderListResponse {
     private Long insuranceId;
 
     private InsuranceManager insuranceManager;
+
+    private Long cityId;
+
+    /*街道id*/
+    private Long streetId;
+
+    private Long provinceId;
+
+    private String name;
+    private String phone;
+
+    private String provinceName;
+
+    private String cityName;
+
+    private String countryName;
+
+    private String streetName;
+
+
+    private Long countryId;
+
 }