From b111b2262be0192d42aaaf5491b9042ab2af6417 Mon Sep 17 00:00:00 2001
From: Jack <46790855@qq.com>
Date: Sat, 9 Nov 2024 18:15:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=96=E5=8D=95=E5=8F=B7?=
 =?UTF-8?q?=E7=9A=84=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ShopOrderBaseServiceImpl.java        |   3 ++-
 .../mapper/order/ShopOrderBaseMapper.xml      |   4 ++--
 .../impl/ShopOrderBaseServiceImpl.class       | Bin 271153 -> 271153 bytes
 .../mapper/order/ShopOrderBaseMapper.xml      |   4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java
index a7d2d4a4..e1a29cef 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java
@@ -8246,7 +8246,8 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl<ShopOrderBaseMappe
             return null;
         }
 
-        m.put("order_pickup_num_str", String.format("%07d", m.get("order_pickup_num"))); // 取单号左补0，共7位数
+        // 7位数取单号，位数不够向左补0
+        m.put("order_pickup_num_str", String.format("%07d", m.get("order_pickup_num")));
         m.put("seller_message", "");//卖家留言
         m.put("order_items", orderItems);//订单商品列表
         m.put("order_items_count", orderItems.size());//商品数量
diff --git a/mall-shop/src/main/resources/mapper/order/ShopOrderBaseMapper.xml b/mall-shop/src/main/resources/mapper/order/ShopOrderBaseMapper.xml
index 4dc12769..1bef985b 100644
--- a/mall-shop/src/main/resources/mapper/order/ShopOrderBaseMapper.xml
+++ b/mall-shop/src/main/resources/mapper/order/ShopOrderBaseMapper.xml
@@ -522,9 +522,9 @@
     <select id="getOrderPrintInfo" resultType="java.util.Map">
         select
             a.order_id,a.store_id,a.store_name,a.buyer_user_id, a.buyer_user_name,a.order_time,a.order_payment_amount,a.order_product_amount,
-            b.order_title, b.delivery_type_id, b.payment_type_id, b.payment_time,
+            b.order_title, b.delivery_type_id, b.payment_type_id, b.payment_time, b.order_pickup_num,
             c.order_message, c.order_item_amount, c.order_shipping_fee,c.delivery_time,
-            e.store_tel, e.order_pickup_num,
+            e.store_tel,
             f.da_province,f.da_city,f.da_address,f.da_mobile, f.order_id
         from shop_order_base a
         inner join shop_order_info b on a.order_id=b.order_id
diff --git a/mall-shop/target/classes/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.class b/mall-shop/target/classes/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.class
index 4e0dda56dc58b167fab550c39b5eaaf9f87e8b0f..38cba7063e0003be7154e8ba5f233c1781cb0099 100644
GIT binary patch
delta 51
zcmdmZOkm?Nfrc%NA%=`8?V*N@K+Lo~)R6i0aX~AFKm}`tSOpt~Oa)tpS_S*<fj^la
GXaWGoKM<S%

delta 51
zcmdmZOkm?Nfrc%NA%=`;?V*N@K+Lo~)R6i0aY0LlKm{v?SOsf_Oa&W;S_Ql9fj^la
GXaWGoLJ*k%

diff --git a/mall-shop/target/classes/mapper/order/ShopOrderBaseMapper.xml b/mall-shop/target/classes/mapper/order/ShopOrderBaseMapper.xml
index 4dc12769..1bef985b 100644
--- a/mall-shop/target/classes/mapper/order/ShopOrderBaseMapper.xml
+++ b/mall-shop/target/classes/mapper/order/ShopOrderBaseMapper.xml
@@ -522,9 +522,9 @@
     <select id="getOrderPrintInfo" resultType="java.util.Map">
         select
             a.order_id,a.store_id,a.store_name,a.buyer_user_id, a.buyer_user_name,a.order_time,a.order_payment_amount,a.order_product_amount,
-            b.order_title, b.delivery_type_id, b.payment_type_id, b.payment_time,
+            b.order_title, b.delivery_type_id, b.payment_type_id, b.payment_time, b.order_pickup_num,
             c.order_message, c.order_item_amount, c.order_shipping_fee,c.delivery_time,
-            e.store_tel, e.order_pickup_num,
+            e.store_tel,
             f.da_province,f.da_city,f.da_address,f.da_mobile, f.order_id
         from shop_order_base a
         inner join shop_order_info b on a.order_id=b.order_id