From 7844f470fa5326e68e5295268d20432c03191f7b Mon Sep 17 00:00:00 2001
From: cb <642514070@qq.com>
Date: Tue, 22 Apr 2025 19:58:01 +0800
Subject: [PATCH] no message

---
 .../web/controller/order/OrderController.java  | 18 ++++++++++++++++++
 .../order/OrderMasterController.java           |  6 +++++-
 .../service/impl/OrderMasterServiceImpl.java   |  1 +
 3 files changed, 24 insertions(+), 1 deletion(-)

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 a7b0bf8d..29b50dad 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
@@ -268,6 +268,19 @@ public class OrderController extends BaseController {
         orderMaster.setGoodsSpecification(request.getGoodsSpecification());
         orderMaster.setConsultMode(request.getConsultMode());
         orderMaster.setRemark(request.getRemark());
+
+        orderMaster.setProvinceId(request.getProvinceId());
+        orderMaster.setCityId(request.getCityId());
+        orderMaster.setCountryId(request.getDistrictId());
+        orderMaster.setAddress(request.getFullAddress());
+        orderMaster.setPhone(customerAddress.getPhone());
+        orderMaster.setName(customerAddress.getName());
+        orderMaster.setProvinceName(customerAddress.getProvinceName());
+        orderMaster.setCityName(customerAddress.getCityName());
+        orderMaster.setCountryName(customerAddress.getCountryName());
+        orderMaster.setStreetId(request.getStreetId());
+        orderMaster.setStreetName(customerAddress.getStreetName());
+
         if("01".equalsIgnoreCase(orderMaster.getConsultMode())){
             orderMaster.setOrderMode("02");
             orderMaster.setPayMode("01");
@@ -554,6 +567,11 @@ public class OrderController extends BaseController {
         orderMaster.setAddress(customerAddress.getAddress());
         orderMaster.setName(customerAddress.getName());
         orderMaster.setPhone(customerAddress.getPhone());
+        orderMaster.setProvinceName(customerAddress.getProvinceName());
+        orderMaster.setCityName(customerAddress.getCityName());
+        orderMaster.setCountryName(customerAddress.getCountryName());
+        orderMaster.setStreetId(request.getStreetId());
+        orderMaster.setStreetName(customerAddress.getStreetName());
 
 
         // TODO 优惠金额不知道咋算 暂时先给0
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 0742ad64..5926e768 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
@@ -624,7 +624,11 @@ public class OrderMasterController extends BaseController {
         orderMaster.setAddress(request.getFullAddress());
         orderMaster.setPhone(customerAddress.getPhone());
         orderMaster.setName(customerAddress.getName());
-
+        orderMaster.setProvinceName(customerAddress.getProvinceName());
+        orderMaster.setCityName(customerAddress.getCityName());
+        orderMaster.setCountryName(customerAddress.getCountryName());
+        orderMaster.setStreetId(request.getStreetId());
+        orderMaster.setStreetName(customerAddress.getStreetName());
 
         // 存在登陆用户的情况下
         if(getSysUser() != null){
diff --git a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java
index 7db3c43b..23c35b26 100644
--- a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java
+++ b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java
@@ -766,6 +766,7 @@ public class OrderMasterServiceImpl implements OrderMasterService {
 
     @Override
     public int updateOrderMasterAddressById(OrderMaster orderMaster) {
+        logger.info("传入的更新订单地址对应的数据{}",orderMaster);
         return orderMasterMapper.updateOrderMasterAddressById(orderMaster);
     }