添加查询语句

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/dal/mysql/order/TradeOrderMapper.java

@@ -269,4 +269,6 @@ public interface TradeOrderMapper extends BaseMapperX<TradeOrderDO> {
 
     @TenantIgnore
     List<TradeOrderDO> getCanContractOrder();
+
+    List<TradeOrderDO> getValidSimpleOrderInfoByVoyageId(@Param("voyageId") Long voyageId);
 }

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/dal/mysql/order/TradeVisitorMapper.java

@@ -133,4 +133,7 @@ public interface TradeVisitorMapper extends BaseMapperX<TradeVisitorDO> {
     @Update("UPDATE trade_visitor SET deleted = #{deleted},update_time = now() WHERE id = #{id}")
     @TenantIgnore
     void updateDeletedById(@Param("id") Long id, @Param("deleted")  int deleted);
+
+    List<TradeVisitorDO> getValidSimpleVisitorInfoByVoyageIdAndOrderId(@Param("voyageId") Long voyageId, @Param("orderId")Long orderId);
+
 }

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

@@ -2988,5 +2988,13 @@
     <select id="getCanContractOrder" resultType="com.yc.ship.module.trade.dal.dataobject.order.TradeOrderDO">
         SELECT  * FROM trade_order WHERE is_contract is null and travel_date BETWEEN CONCAT(DATE_ADD(CURDATE(),INTERVAL 1 DAY),' 00:00:00') and CONCAT(DATE_ADD(CURDATE(),INTERVAL 2 DAY), ' 23:59:59')
     </select>
+    
+    <select id="getValidSimpleOrderInfoByVoyageId"
+            resultType="com.yc.ship.module.trade.dal.dataobject.order.TradeOrderDO">
+        select id,order_no
+        from trade_order
+        where deleted=0 and voyage_id=#{voyageId} and order_status in (1,6,9,13,14,15)
+        order by substring_index(order_no, '-', -1)*1
+    </select>
 </mapper>
 

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

@@ -548,4 +548,16 @@
     <delete id="deleteAllByOrderId">
         delete from trade_visitor where order_id = #{orderId}
     </delete>
+    
+    <select id="getValidSimpleVisitorInfoByVoyageIdAndOrderId"
+            resultType="com.yc.ship.module.trade.dal.dataobject.order.TradeVisitorDO">
+        select a.id,a.name
+        from trade_visitor a
+        join trade_order b on a.order_id=b.id
+        where a.deleted=0 and b.deleted=0
+        and b.voyage_id=#{voyageId}
+        and b.order_status in (1,6,9,13,14,15)
+        <if test="orderId != null" >and a.order_id=#{orderId}</if>
+        order by substring_index(b.order_no, '-', -1)*1 ,a.id
+    </select>
 </mapper>