接站更新

ship-module-trade/ship-module-trade-biz/src/main/resources/mapper/orderjzdetail/OrderGiftVisitorMapper.xml

@@ -29,13 +29,13 @@
               dj.remark as dispatchRemark,
              gfv.sign_remark as remark
         FROM trade_visitor v
-        LEFT JOIN  trade_order_jz_gift_visitor gfv ON gfv.visitor_id = v.id
+        LEFT JOIN  trade_order_jz_gift_visitor gfv ON gfv.visitor_id = v.id and gfv.deleted = 0
         INNER JOIN trade_order o ON v.order_id = o.id
         INNER JOIN product_voyage pv ON o.voyage_id = pv.id
         inner join trade_detail td on td.order_id = o.id and td.visitor_id = v.id  and td.product_id = 2034458675435925505 and td.deleted = 0
         INNER JOIN resource_route r ON pv.route_id = r.id
-        LEFT JOIN resource_room_model rm ON v.room_model_id = rm.id
-        LEFT JOIN trade_order_jz_dispatch dj ON gfv.dispatch_id = dj.id AND dj.source_type = 2
+        LEFT JOIN resource_room_model rm ON v.room_model_id = rm.id and rm.deleted = 0
+        LEFT JOIN trade_order_jz_dispatch dj ON gfv.dispatch_id = dj.id AND dj.source_type = 2 and dj.deleted = 0
         WHERE v.deleted = 0 AND o.deleted = 0 AND pv.deleted = 0 AND o.order_status IN (15, 14, 13, 10, 12, 9, 8, 7, 6, 5, 4, 3, 1, 0)
         AND o.voyage_id = #{vo.voyageId}
         <if test="vo.idCard != null and vo.idCard != ''">
@@ -92,13 +92,13 @@
             dj.remark as dispatchRemark,
             gfv.sign_remark as remark
         FROM trade_visitor v
-        LEFT JOIN  trade_order_jz_gift_visitor gfv ON gfv.visitor_id = v.id AND v.deleted = 0
+        LEFT JOIN  trade_order_jz_gift_visitor gfv ON gfv.visitor_id = v.id AND v.deleted = 0 and gfv.deleted = 0
         INNER JOIN trade_order o ON v.order_id = o.id AND o.deleted = 0
         inner join trade_detail td on td.order_id = o.id and td.visitor_id = v.id and td.product_id = 2034458675435925505 and td.deleted = 0
         INNER JOIN product_voyage pv ON o.voyage_id = pv.id AND pv.deleted = 0
         INNER JOIN resource_route r ON pv.route_id = r.id
         LEFT JOIN resource_room_model rm ON v.room_model_id = rm.id
-        LEFT JOIN trade_order_jz_dispatch dj ON gfv.dispatch_id = dj.id AND dj.source_type = 2
+        LEFT JOIN trade_order_jz_dispatch dj ON gfv.dispatch_id = dj.id AND dj.source_type = 2 and dj.deleted = 0
         WHERE  o.voyage_id = #{vo.voyageId} AND o.order_status IN (15, 14, 13, 10, 12, 9, 8, 7, 6, 5, 4, 3, 1, 0)
         <if test="vo.idCard != null and vo.idCard != ''">
             AND v.credential_no LIKE CONCAT('%', #{vo.idCard}, '%')

ship-module-trade/ship-module-trade-biz/src/main/resources/mapper/orderjzdetail/OrderJzDetailMapper.xml

@@ -16,13 +16,13 @@
         dj.bus_number as busNumber, dj.driver_name as driverName, dj.driver_phone as driverPhone,
         dj.receiver_name as receiverName, dj.receiver_phone as receiverPhone, d.sign_remark as dispatchRemark
         from trade_order_jz_detail d
-        inner join trade_order_jz oz on d.jz_id = oz.id
+        inner join trade_order_jz oz on d.jz_id = oz.id and oz.deleted = 0
         inner join trade_order o on o.deleted = 0 and o.id = oz.order_id
-        inner join product_voyage v on o.voyage_id = v.id
-        inner join resource_route r on v.route_id = r.id
-        inner join trade_visitor u on u.credential_no = d.id_card and u.order_id = oz.order_id
-        left join resource_room_model rm on u.room_model_id = rm.id
-        left join trade_order_jz_dispatch dj on d.dispatch_id = dj.id
+        inner join product_voyage v on o.voyage_id = v.id and v.deleted = 0
+        inner join resource_route r on v.route_id = r.id and r.deleted = 0
+        inner join trade_visitor u on u.credential_no = d.id_card and u.order_id = oz.order_id and u.deleted = 0
+        left join resource_room_model rm on u.room_model_id = rm.id and rm.deleted = 0
+        left join trade_order_jz_dispatch dj on d.dispatch_id = dj.id and dj.deleted = 0
         inner join trade_detail td on td.order_id = o.id and td.product_id != 2034458675435925505
         where d.deleted = 0 and o.voyage_id = #{vo.voyageId} and o.order_status IN (15, 14, 13, 10, 12, 9, 8, 7, 6, 5, 4, 3, 1, 0)
         <if test="vo.idCard != null">
@@ -40,6 +40,9 @@
         <if test="vo.dispatchNo != null and vo.dispatchNo != ''">
             and dj.dispatch_no like concat('%', #{vo.dispatchNo}, '%')
         </if>
+        <if test="vo.orderNo != null and vo.orderNo != ''">
+            and o.order_no = #{vo.orderNo}
+        </if>
         <if test="vo.signStatus != null and vo.signStatus == 1">
             and d.sign_time is not null
         </if>
@@ -55,13 +58,13 @@
         select distinct d.* , r.direction , rm.name as room_model_name,
         o.order_no as orderNo,o.source_name as sourceName, dj.dispatch_no as dispatchNo, dj.group_no as groupNo, dj.bus_number as busNumber,dj.driver_name as driverName,dj.driver_phone as driverPhone,dj.receiver_name as receiverName,dj.receiver_phone as receiverPhone,d.sign_remark as dispatchRemark
         from trade_order_jz_detail d
-        inner join trade_order_jz oz on d.jz_id = oz.id
+        inner join trade_order_jz oz on d.jz_id = oz.id and oz.deleted = 0
         inner join trade_order o on o.deleted = 0 and o.id = oz.order_id
-        inner join product_voyage v on o.voyage_id = v.id
-        inner join resource_route r on v.route_id = r.id
-        inner join trade_visitor u on u.credential_no = d.id_card and u.order_id = oz.order_id
-        left join resource_room_model rm on u.room_model_id = rm.id
-        left join trade_order_jz_dispatch dj on d.dispatch_id = dj.id
+        inner join product_voyage v on o.voyage_id = v.id and v.deleted = 0
+        inner join resource_route r on v.route_id = r.id and r.deleted = 0
+        inner join trade_visitor u on u.credential_no = d.id_card and u.order_id = oz.order_id and u.deleted = 0
+        left join resource_room_model rm on u.room_model_id = rm.id and rm.deleted = 0
+        left join trade_order_jz_dispatch dj on d.dispatch_id = dj.id and dj.deleted = 0
         inner join trade_detail td on td.order_id = o.id and td.product_id != 2034458675435925505
         where d.deleted = 0 and o.voyage_id = #{vo.voyageId} and o.order_status IN (15, 14, 13, 10, 12, 9, 8, 7, 6, 5, 4, 3, 1, 0)
         <if test="vo.idCard != null and vo.idCard != ''">
@@ -76,6 +79,9 @@
         <if test="vo.arriveTime != null and vo.arriveTime != ''">
             and d.arrive_time = #{vo.arriveTime}
         </if>
+        <if test="vo.orderNo != null and vo.orderNo != ''">
+            and o.order_no = #{vo.orderNo}
+        </if>
         <if test="vo.dispatchNo != null and vo.dispatchNo != ''">
             and dj.dispatch_no like concat('%', #{vo.dispatchNo}, '%')
         </if>