feat(xml): 解决上海沪佳未预约时查不到包件信息的问题

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