From 700b261e3666f4e6b7dcf4e3a54e848e92ff47b3 Mon Sep 17 00:00:00 2001
From: cb <275647614@qq.com>
Date: Thu, 24 Apr 2025 11:46:06 +0800
Subject: [PATCH] no message

---
 .../web/controller/order/OrderController.java |  1 +
 .../order/OrderMasterController.java          | 37 +++++++++++++------
 2 files changed, 27 insertions(+), 11 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 34972fd6..f1a43b65 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
@@ -560,6 +560,7 @@ public class OrderController extends BaseController {
 
         //处理新增订单的地址
         CustomerAddress customerAddress=customerAddressService.selectByCustomerAddressId(appOrderRequest.getAddressId());
+        logger.info("下单后的地址信息{}",customerAddress);
         orderMaster.setProvinceId(customerAddress.getProvinceId());
         orderMaster.setCityId(customerAddress.getCityId());
         orderMaster.setCountryId(customerAddress.getCountryId());
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 7009c05c..005b6324 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
@@ -1308,17 +1308,32 @@ public class OrderMasterController extends BaseController {
             orderListResponse.setIsCall(orderMaster.getIsCall());
             orderListResponse.setAddress(orderMaster.getAddress());
 
-            orderListResponse.setProvinceId(orderMaster.getProvinceId());
-            orderListResponse.setCityId(orderMaster.getCityId());
-            orderListResponse.setCountryId(orderMaster.getCountryId());
-            orderListResponse.setAddress(orderMaster.getAddress());
-            orderListResponse.setPhone(orderMaster.getPhone());
-            orderListResponse.setName(orderMaster.getName());
-            orderListResponse.setProvinceName(orderMaster.getProvinceName());
-            orderListResponse.setCityName(orderMaster.getCityName());
-            orderListResponse.setCountryName(orderMaster.getCountryName());
-            orderListResponse.setStreetId(orderMaster.getStreetId());
-            orderListResponse.setStreetName(orderMaster.getStreetName());
+            if (!StringUtils.isEmpty(orderMaster.getProvinceName())){
+                orderListResponse.setProvinceId(orderMaster.getProvinceId());
+                orderListResponse.setCityId(orderMaster.getCityId());
+                orderListResponse.setCountryId(orderMaster.getCountryId());
+                orderListResponse.setAddress(orderMaster.getAddress());
+                orderListResponse.setPhone(orderMaster.getPhone());
+                orderListResponse.setName(orderMaster.getName());
+                orderListResponse.setProvinceName(orderMaster.getProvinceName());
+                orderListResponse.setCityName(orderMaster.getCityName());
+                orderListResponse.setCountryName(orderMaster.getCountryName());
+                orderListResponse.setStreetId(orderMaster.getStreetId());
+                orderListResponse.setStreetName(orderMaster.getStreetName());
+            }else{
+                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) {