From 65ed6707da0b7f4276a29899479ac78c85b5c937 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E5=B0=8F=E5=BC=A0?= <1085577365@qq.com>
Date: Wed, 24 May 2023 19:15:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0--=E8=BF=90=E8=B4=B9=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=EF=BC=9A=E9=85=8D=E9=80=81=E5=8C=BA=E5=9F=9F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../express/ShippingTemplatesFreeMapper.xml    | 18 +++++++++++++++++-
 .../ShippingTemplatesNoDeliveryMapper.xml      | 18 +++++++++++++++++-
 .../express/ShippingTemplatesRegionMapper.xml  | 18 +++++++++++++++++-
 3 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesFreeMapper.xml b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesFreeMapper.xml
index 31a4a8431..b82a15ce5 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesFreeMapper.xml
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesFreeMapper.xml
@@ -3,6 +3,22 @@
 <mapper namespace="cn.iocoder.yudao.module.shop.dal.mysql.express.ShippingTemplatesFreeMapper">
 
     <select id="getListGroup" resultType="cn.iocoder.yudao.module.shop.controller.admin.express.vo.ShippingTemplatesFreeRespVO" parameterType="integer">
-        SELECT group_concat(`city_id`) AS city_id, province_id, title, `number`, price, uniqid FROM eb_shipping_templates_free where temp_id = #{tempId, jdbcType=INTEGER} GROUP BY `uniqid`,id ORDER BY id ASC
+        SELECT
+            city_id, province_id, title, `number`, price, uniqid
+        FROM
+            eb_shipping_templates_free es
+                JOIN
+            (
+                SELECT
+                    MAX(id) id
+                FROM
+                    eb_shipping_templates_free
+                where
+                    temp_id = #{tempId, jdbcType=INTEGER}
+                GROUP BY
+                    `uniqid`
+                ORDER BY id ASC
+            ) a
+        ON a.id = es.id
     </select>
 </mapper>
diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesNoDeliveryMapper.xml b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesNoDeliveryMapper.xml
index c1b34165a..6b042f88e 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesNoDeliveryMapper.xml
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesNoDeliveryMapper.xml
@@ -3,6 +3,22 @@
 <mapper namespace="cn.iocoder.yudao.module.shop.dal.mysql.express.ShippingTemplatesNoDeliveryMapper">
 
     <select id="getList" resultType="cn.iocoder.yudao.module.shop.controller.admin.express.vo.ShippingTemplatesNoDeliveryRespVO" parameterType="integer">
-        SELECT group_concat(`city_id`) AS city_id, province_id, title, uniqid FROM eb_shipping_templates_no_delivery WHERE temp_id = #{tempId, jdbcType=INTEGER} GROUP BY `uniqid`,id ORDER BY id ASC
+        SELECT
+            city_id, province_id, title, uniqid
+        FROM
+            eb_shipping_templates_no_delivery es
+                JOIN
+            (
+                SELECT
+                    MAX(id) id
+                FROM
+                    eb_shipping_templates_no_delivery
+                where
+                    temp_id = #{tempId, jdbcType=INTEGER}
+                GROUP BY
+                    `uniqid`
+                ORDER BY id ASC
+            ) a
+        ON a.id = es.id
     </select>
 </mapper>
diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesRegionMapper.xml b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesRegionMapper.xml
index 190b3e935..1aefe98c4 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesRegionMapper.xml
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesRegionMapper.xml
@@ -3,6 +3,22 @@
 <mapper namespace="cn.iocoder.yudao.module.shop.dal.mysql.express.ShippingTemplatesRegionMapper">
 
     <select id="getListGroup" resultType="cn.iocoder.yudao.module.shop.controller.admin.express.vo.ShippingTemplatesRegionRespVO" parameterType="integer">
-        SELECT group_concat(`city_id`) AS city_id, province_id, `first`, first_price, title, `renewal`, renewal_price, uniqid FROM eb_shipping_templates_region where temp_id = #{tempId, jdbcType=INTEGER} GROUP BY `uniqid`,id ORDER BY id ASC
+        SELECT
+            city_id, province_id, `first`, first_price, title, `renewal`, renewal_price, uniqid
+        FROM
+            eb_shipping_templates_region es
+        JOIN
+            (
+                SELECT
+                    MAX(id) id
+                FROM
+                    eb_shipping_templates_region
+                where
+                    temp_id = #{tempId, jdbcType=INTEGER}
+                GROUP BY
+                    `uniqid`
+                ORDER BY id ASC
+            ) a
+        ON a.id = es.id
     </select>
 </mapper>