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

---
 .../order/OrderMasterController.java          |  8 +++++
 .../com/ghy/order/domain/OrderMaster.java     |  8 +++++
 .../mapper/order/OrderMasterMapper.xml        | 34 +++++++++++++++++++
 3 files changed, 50 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 68ea1394..0742ad64 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
@@ -1788,4 +1788,12 @@ public class OrderMasterController extends BaseController {
     public AjaxResult statistics() {
         return AjaxResult.success(orderMasterService.orderStatisticsReturn());
     }
+
+
+    @GetMapping("/updateMasterAddress")
+    @ResponseBody
+    public AjaxResult updateMasterAddress(OrderMaster orderMaster) {
+
+        return toAjax(orderMasterService.updateOrderMasterAddressById(orderMaster));
+    }
 }
diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java
index 13878274..1b4f0171 100644
--- a/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java
+++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java
@@ -227,4 +227,12 @@ public class OrderMaster extends BaseEntity {
 
     private String name;
     private String phone;
+
+    private String provinceName;
+
+    private String cityName;
+
+    private String countryName;
+
+    private String streetName;
 }
diff --git a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
index 1b8e7fc1..28a66ba7 100644
--- a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
+++ b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
@@ -46,6 +46,11 @@
         <result property="address"        column="address"/>
         <result property="name"        column="name"/>
         <result property="phone"        column="phone"/>
+        <result property="provinceName"        column="province_name"/>
+        <result property="cityName"        column="city_name"/>
+        <result property="countryName"        column="country_name"/>
+        <result property="streetName"        column="street_name"/>
+
     </resultMap>
 
     <sql id="selectOrderMaster">
@@ -457,6 +462,10 @@
         <if test="address != null">address,</if>
         <if test="name != null">name,</if>
         <if test="phone != null">phone,</if>
+        <if test="provinceName != null">province_name,</if>
+        <if test="cityName != null">city_name,</if>
+        <if test="countryName != null">country_name,</if>
+        <if test="streetName != null">street_name,</if>
         create_time
         )VALUES(
         <if test="deptId != null and deptId != 0">#{deptId},</if>
@@ -488,6 +497,10 @@
         <if test="address != null">#{address},</if>
         <if test="name != null">#{name},</if>
         <if test="phone != null">#{phone},</if>
+        <if test="provinceName != null">#{provinceName},</if>
+        <if test="cityName != null">#{cityName},</if>
+        <if test="countryName != null">#{countryName},</if>
+        <if test="streetName != null">#{streetName},</if>
         SYSDATE()
         )
     </insert>
@@ -588,4 +601,25 @@
         <if test="timeoutFineTimes != null">,timeout_fine_times = #{timeoutFineTimes}</if>
         WHERE id = #{id}
     </update>
+
+    <update id="updateOrderMasterAddressById" parameterType="com.ghy.order.domain.OrderMaster">
+        UPDATE order_master
+        <set>
+            <if test="name != null">name = #{name},</if>
+            <if test="phone != null">phone = #{phone},</if>
+            <if test="provinceId != null">province_id = #{provinceId},</if>
+            <if test="provinceName != null">province_name = #{provinceName},</if>
+            <if test="cityName != null">city_name = #{cityName},</if>
+            <if test="countryName != null">country_name = #{countryName},</if>
+            <if test="streetName != null">street_name = #{streetName},</if>
+            <if test="cityId != null">city_id = #{cityId},</if>
+            <if test="countryId != null">country_id = #{countryId},</if>
+            <if test="streetId != null">street_id = #{streetId},</if>
+            <if test="address != null">address = #{address}</if>
+        </set>
+        WHERE id = #{id}
+    </update>
+
+
+
 </mapper>