Browse Source

订单管理—导出游客接口新增

jinch 2 weeks ago
parent
commit
7ef2726b46

+ 2 - 10
ship-module-trade/ship-module-trade-biz/src/main/resources/mapper/order/TradeOrderMapper.xml

@@ -2119,17 +2119,9 @@
         LEFT JOIN resource_route rr ON pv.route_id = rr.id
         LEFT JOIN resource_route rr ON pv.route_id = rr.id
         LEFT JOIN ota_distributor od on od.id = tor.source_id
         LEFT JOIN ota_distributor od on od.id = tor.source_id
         WHERE tor.deleted = 0
         WHERE tor.deleted = 0
-        <choose>
-            <when test="vo.orderNoList != null and vo.orderNoList.size() > 0">
-                AND tor.order_no IN
-                <foreach collection="vo.orderNoList" item="item" separator="," open="(" close=")">
-                    #{item}
-                </foreach>
-            </when>
-            <when test="vo.orderNo != null and vo.orderNo != ''">
+        <if test="vo.orderNo != null and vo.orderNo != ''">
                 AND tor.order_no = #{vo.orderNo}
                 AND tor.order_no = #{vo.orderNo}
-            </when>
-        </choose>
+        </if>
         <if test="vo.voyageId != null and vo.voyageId != ''">
         <if test="vo.voyageId != null and vo.voyageId != ''">
             AND tor.voyage_id = #{vo.voyageId}
             AND tor.voyage_id = #{vo.voyageId}
         </if>
         </if>

+ 3 - 10
ship-module-trade/ship-module-trade-biz/src/main/resources/mapper/order/TradeVisitorMapper.xml

@@ -262,17 +262,10 @@
         LEFT JOIN ota_distributor od on od.id = tor.source_id
         LEFT JOIN ota_distributor od on od.id = tor.source_id
         LEFT JOIN trade_order_room_model torm ON tv.room_index_id = torm.room_index_id AND torm.deleted = 0
         LEFT JOIN trade_order_room_model torm ON tv.room_index_id = torm.room_index_id AND torm.deleted = 0
         WHERE tv.deleted = 0
         WHERE tv.deleted = 0
-        <choose>
-            <when test="vo.orderNoList != null and vo.orderNoList.size() > 0">
-                AND tor.order_no IN
-                <foreach collection="vo.orderNoList" item="item" separator="," open="(" close=")">
-                    #{item}
-                </foreach>
-            </when>
-            <when test="vo.orderNo != null and vo.orderNo != ''">
+
+            <if test="vo.orderNo != null and vo.orderNo != ''">
                 AND tor.order_no = #{vo.orderNo}
                 AND tor.order_no = #{vo.orderNo}
-            </when>
-        </choose>
+            </if>
         <if test="vo.voyageId != null and vo.voyageId != ''">
         <if test="vo.voyageId != null and vo.voyageId != ''">
             AND tor.voyage_id = #{vo.voyageId}
             AND tor.voyage_id = #{vo.voyageId}
         </if>
         </if>