From 11867df921a973def18000324b28928c95814038 Mon Sep 17 00:00:00 2001
From: Qiuyi LI <qiuyi.li@gmail.com>
Date: Wed, 6 Dec 2023 12:13:51 +0100
Subject: [PATCH] Add field "city" to PlatformOrder

---
 .../business/domain/api/mabang/getorderlist/Order.java    | 5 +++++
 .../business/mapper/xml/PlatformOrderMabangMapper.xml     | 8 +++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/getorderlist/Order.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/getorderlist/Order.java
index d87a18e20..8a66c0437 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/getorderlist/Order.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/getorderlist/Order.java
@@ -84,6 +84,11 @@ public class Order {
      */
     @JSONField(name = "countryNameEN")
     private String country;
+    /**
+     * 订单收件人城市
+     */
+    @JSONField(name = "city")
+    private String city;
     /**
      * 订单收件人邮编
      */
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderMabangMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderMabangMapper.xml
index 351832dff..027ddb161 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderMabangMapper.xml
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderMabangMapper.xml
@@ -91,6 +91,11 @@
             when #{item.id} then #{item.country}
         </foreach>
         end,
+        city = case id
+        <foreach collection="orders" separator=" " open="" close="" index="index" item="item">
+            when #{item.id} then #{item.city}
+        </foreach>
+        end,
         postcode = case id
         <foreach collection="orders" separator=" " open="" close="" index="index" item="item">
             when #{item.id} then #{item.postcode}
@@ -157,7 +162,7 @@
         update_time, shop_id, logistic_channel_name,
         platform_order_id, platform_order_number, erp_order_id,
         tracking_number, internal_tracking_number, order_time, shipping_time, recipient,
-        country, postcode, erp_status, product_available, can_send)
+        country, city, postcode, erp_status, product_available, can_send)
         VALUES
         <foreach collection="orders" separator="," open="" close="" item="order" index="index">
             (
@@ -177,6 +182,7 @@
             #{order.shippingTime},
             #{order.recipient},
             #{order.country},
+            #{order.city},
             #{order.postcode},
             #{order.status},
             #{order.productAvailable},