支持订单列表服务商多选

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/order/OtcTradeOrderController.java

@@ -676,12 +676,12 @@ public class OtcTradeOrderController {
     /**
      * 导出游客名单-计调
      */
-    @GetMapping("/export-touristExcel")
+    @PostMapping("/export-touristExcel")
     @Operation(summary = "导出游客名单 Excel")
     @OperateLog(type = EXPORT, enable = false)
     @PlatTenantEnv
     @PreAuthorize("@ss.hasPermission('trade:order:export-operator')")
-    public void exportTouristList(@Valid TradeOrderPageReqVO pageReqVO, HttpServletResponse response) throws IOException {
+    public void exportTouristList(@Valid @RequestBody TradeOrderPageReqVO pageReqVO, HttpServletResponse response) throws IOException {
         File tempFile = otcTradeOrderService.exportTouristList(pageReqVO);
         try {
         response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
@@ -700,12 +700,12 @@ public class OtcTradeOrderController {
     /**
      * 导出游客名单-代理商
      */
-    @GetMapping("/export-touristExcel-agent")
+    @PostMapping("/export-touristExcel-agent")
     @Operation(summary = "导出游客名单 Excel")
     @OperateLog(type = EXPORT, enable = false)
     @PlatTenantEnv
     @PreAuthorize("@ss.hasPermission('trade:order:export-agent')")
-    public void exportTouristListToAgent(@Valid TradeOrderPageReqVO pageReqVO, HttpServletResponse response) throws IOException {
+    public void exportTouristListToAgent(@Valid @RequestBody TradeOrderPageReqVO pageReqVO, HttpServletResponse response) throws IOException {
         File tempFile = otcTradeOrderService.exportTouristListToAgent(pageReqVO);
         try {
         response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/order/vo/order/TradeOrderPageReqVO.java

@@ -193,6 +193,9 @@ public class TradeOrderPageReqVO extends PageParam {
     @Schema(description = "分销商ID", example = "张三")
     private String otaId;
 
+    @Schema(description = "分销商ID列表", example = "张三")
+    private List<String> otaIds;
+
     @Schema(description = "旅行社类型", example = "0自营 1外部")
     @Hidden
     private Integer otcType;

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/order/vo/refund/RefundPageReqVO.java

@@ -120,4 +120,7 @@ public class RefundPageReqVO extends PageParam {
     @Schema(description = "分销商ID", example = "张三")
     private String otaId;
 
+    @Schema(description = "分销商ID列表", example = "张三")
+    private List<String> otaIds;
+
 }

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/orderjzdetail/vo/OrderJzDetailPageReqVO.java

@@ -8,6 +8,7 @@ import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 import static com.yc.ship.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
@@ -67,4 +68,7 @@ public class OrderJzDetailPageReqVO extends PageParam {
 
     @Schema(description = "分销商ID")
     private String otaId;
+
+    @Schema(description = "分销商ID列表")
+    private List<String> otaIds;
 }

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

@@ -348,6 +348,12 @@
         <if test="vo.otaId != null and vo.otaId != ''">
             AND td.source_id = #{vo.otaId}
         </if>
+        <if test="vo.otaIds != null and vo.otaIds.size()>0">
+            AND td.source_id IN
+            <foreach collection="vo.otaIds" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
         <if test="vo.storeId != null and vo.storeId != ''">
             AND td.store_id = #{vo.storeId}
         </if>
@@ -556,6 +562,12 @@
         <if test="vo.otaId != null and vo.otaId != ''">
             AND td.source_id = #{vo.otaId}
         </if>
+        <if test="vo.otaIds != null and vo.otaIds.size()>0">
+            AND td.source_id IN
+            <foreach collection="vo.otaIds" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
         <if test="vo.storeId != null and vo.storeId != ''">
             AND td.store_id = #{vo.storeId}
         </if>
@@ -760,6 +772,12 @@
         <if test="vo.otaId != null and vo.otaId != ''">
             AND td.source_id = #{vo.otaId}
         </if>
+        <if test="vo.otaIds != null and vo.otaIds.size()>0">
+            AND td.source_id IN
+            <foreach collection="vo.otaIds" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
         <if test="vo.otaCateIds!=null and vo.otaCateIds.size()>0">
             and od.ota_category_id in
             <foreach collection="vo.otaCateIds" item="item" separator=","  open="(" close=")">
@@ -985,6 +1003,12 @@
         <if test="vo.otaId != null and vo.otaId != ''">
             AND td.source_id = #{vo.otaId}
         </if>
+        <if test="vo.otaIds != null and vo.otaIds.size()>0">
+            AND td.source_id IN
+            <foreach collection="vo.otaIds" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
         <if test="vo.otaCateIds!=null and vo.otaCateIds.size()>0">
             and od.ota_category_id in
             <foreach collection="vo.otaCateIds" item="item" separator=","  open="(" close=")">
@@ -1292,6 +1316,12 @@
         <if test="vo.otaId != null and vo.otaId != ''">
             AND td.source_id = #{vo.otaId}
         </if>
+        <if test="vo.otaIds != null and vo.otaIds.size()>0">
+            AND td.source_id IN
+            <foreach collection="vo.otaIds" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
         <if test="vo.otaCateIds!=null and vo.otaCateIds.size()>0">
             and od.ota_category_id in
             <foreach collection="vo.otaCateIds" item="item" separator=","  open="(" close=")">
@@ -2288,6 +2318,12 @@
         <if test="vo.otaId != null and vo.otaId != ''">
             AND td.source_id = #{vo.otaId}
         </if>
+        <if test="vo.otaIds != null and vo.otaIds.size()>0">
+            AND td.source_id IN
+            <foreach collection="vo.otaIds" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
         <if test="vo.storeId != null and vo.storeId != ''">
             AND td.store_id = #{vo.storeId}
         </if>
@@ -2454,6 +2490,12 @@
         <if test="vo.otaId != null and vo.otaId != ''">
             AND tor.source_id = #{vo.otaId}
         </if>
+        <if test="vo.otaIds != null and vo.otaIds.size()>0">
+            AND tor.source_id IN
+            <foreach collection="vo.otaIds" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
         <if test="vo.otaCateId != null and vo.otaCateId != ''">
             AND od.ota_category_id = #{vo.otaCateId}
         </if>

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

@@ -243,6 +243,12 @@
         <if test="vo.otaId != null and vo.otaId != ''">
             AND t1.source_id = #{vo.otaId}
         </if>
+        <if test="vo.otaIds != null and vo.otaIds.size()>0">
+            AND t1.source_id IN
+            <foreach collection="vo.otaIds" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
         <if test="vo.orderStatus!=null and vo.orderStatus.size()>0">
             and  t1.order_status in
             <foreach collection="vo.orderStatus" item="item" separator=","  open="(" close=")">
@@ -341,6 +347,12 @@
         <if test="vo.otaId != null and vo.otaId != ''">
             AND tor.source_id = #{vo.otaId}
         </if>
+        <if test="vo.otaIds != null and vo.otaIds.size()>0">
+            AND tor.source_id IN
+            <foreach collection="vo.otaIds" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
         <if test="vo.distributorId != null and vo.distributorId != ''">
             AND tor.source_id = #{vo.distributorId}
         </if>