From a98a5694cf0879d6225938ec10292fddec25ee4e Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <zhaoqiaobo@163.com>
Date: Fri, 26 Apr 2024 14:58:07 +0800
Subject: [PATCH] =?UTF-8?q?feat(xml):=20=E8=A7=A3=E5=86=B3=E4=B8=8A?=
 =?UTF-8?q?=E6=B5=B7=E6=B2=AA=E4=BD=B3=E6=9C=AA=E9=A2=84=E7=BA=A6=E6=97=B6?=
 =?UTF-8?q?=E6=9F=A5=E4=B8=8D=E5=88=B0=E5=8C=85=E4=BB=B6=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/logpm/datasharing/mapper/MerchantMapper.xml    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/mapper/MerchantMapper.xml b/blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/mapper/MerchantMapper.xml
index 925854e8e..04c4f8c33 100644
--- a/blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/mapper/MerchantMapper.xml
+++ b/blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/mapper/MerchantMapper.xml
@@ -25,7 +25,7 @@
           and t.is_deleted = 0
     </select>
     <select id="findPackage" resultType="com.logpm.datasharing.vo.MerchantPackageVO">
-        select lww.shipper_address                   sendAddress,
+        select distinct lww.shipper_address                   sendAddress,
                ldpl.waybill_number                   waybillNumber,
                ldpl.order_package_code               orderPackageCode,
                ldpl.order_package_status             orderPackageStatus,
@@ -37,9 +37,9 @@
                            on ldrs.stock_article_id = t.id and ldrs.stock_article_status !=2
          left join logpm_distribution_reservation ldr
         on ldr.id = ldrs.reservation_id and ldr.reservation_status !=40
-            join logpm_distribution_reservation_package ldrp
+            left join logpm_distribution_reservation_package ldrp
             on ldrp.reservation_id = ldr.id and ldrp.packet_bar_status != 2
-            left join logpm_distribution_parcel_list ldpl on ldpl.id = ldrp.parce_list_id
+            left join logpm_distribution_parcel_list ldpl on ldpl.order_code = t.order_code
             left join logpm_warehouse_waybill lww on lww.waybill_no = ldpl.waybill_number
             left join logpm_distribution_signfor lds on lds.reservation_id = ldr.id
             left join logpm_distribution_delivery_list lddl on lddl.id = lds.delivery_id