Merge branch 'main' of http://47.98.207.247:3000/lsq/ship-ota-server

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/otc/impl/OtcTradeOrderServiceImpl.java

@@ -2764,7 +2764,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
     }
 
     /**
-     * 导出游客名单列表-计调
+     * 导出游客名单列表-代理商
      *
      * 功能说明：
      * 1. 查询订单基础信息（船名、航期、航向）

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

@@ -331,6 +331,9 @@
         <if test="vo.otaId != null and vo.otaId != ''">
             AND tor.source_id = #{vo.otaId}
         </if>
+        <if test="vo.distributorId != null and vo.distributorId != ''">
+            AND tor.source_id = #{vo.distributorId}
+        </if>
         <if test="vo.otaCateId != null and vo.otaCateId != ''">
             AND od.ota_category_id = #{vo.otaCateId}
         </if>