订单查询房型多选，修改库存指定剩余，修改查询条件房型排序

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/dal/mysql/voyagestockdistribute/VoyageStockDistributeNewMapper.java

@@ -64,7 +64,7 @@ public interface VoyageStockDistributeNewMapper extends BaseMapperX<VoyageStockD
     @Select("SELECT" +
             "    SUM(p.book_num + p.num) AS totalNum," +
             "    p.room_model_id as roomModelId," +
-            "    p.num," +
+            "    SUM(p.num) as num," +
             "    p.floor as floor " +
             "FROM " +
             "    product_voyage_stock_distribute_new p " +

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/dal/mysql/roommodel/ResourceRoomModelMapper.java

@@ -42,7 +42,8 @@ public interface ResourceRoomModelMapper extends BaseMapperX<ResourceRoomModelDO
         return selectList(new LambdaQueryWrapperX<ResourceRoomModelDO>()
                 .eqIfPresent(ResourceRoomModelDO::getShipId, shipId)
                 .eq(ResourceRoomModelDO::getStatus, CommonStatusEnum.ENABLE.getStatus())
-                .eq(ResourceRoomModelDO::getCanSale, YesOrNoEnum.YES.getType()));
+                .eq(ResourceRoomModelDO::getCanSale, YesOrNoEnum.YES.getType())
+                .orderByAsc(ResourceRoomModelDO::getSort));
     }
 
     default PageResult<ResourceRoomModelDO> selectAppPage(AppResourceRoomModelPageReqVO pageReqVO) {

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

@@ -232,6 +232,7 @@ public class TradeOrderPageReqVO extends PageParam {
 
 
     private String roomModelId;
+    private List<String> roomModelIds;
     private String floor;
 
     private Integer isInsure;

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

@@ -502,9 +502,9 @@
         FROM trade_order td
         INNER JOIN trade_order_user tou ON td.id = tou.order_id AND tou.deleted = 0
         LEFT JOIN trade_detail tdl ON td.id = tdl.order_id AND tdl.deleted = 0
-        LEFT JOIN product_spu ps ON ps.id = tdl.product_id
-        LEFT JOIN ota_distributor od ON od.id = td.source_id
-        LEFT JOIN trade_order_room_model torm ON torm.order_id = td.id
+        LEFT JOIN product_spu ps ON ps.id = tdl.product_id and ps.deleted=0
+        LEFT JOIN ota_distributor od ON od.id = td.source_id and od.deleted=0
+        LEFT JOIN trade_order_room_model torm ON torm.order_id = td.id and torm.deleted=0
         WHERE td.deleted = 0
 
         <if test="vo.orderStatus!=null and vo.orderStatus.size()>0">
@@ -665,6 +665,12 @@
         <if test="vo.roomModelId != null and vo.roomModelId != ''">
             AND torm.room_model_id = #{vo.roomModelId}
         </if>
+        <if test="vo.roomModelIds!=null and vo.roomModelIds.size()>0">
+            and  torm.room_model_id in
+            <foreach collection="vo.roomModelIds" item="item" separator=","  open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
         <if test="vo.floor != null and vo.floor != ''">
             AND torm.floor = #{vo.floor}
         </if>
@@ -696,19 +702,19 @@
         ps.product_tag productTag,
         ps.product_tag2 productTag2
         FROM trade_order td
-        INNER JOIN trade_order_user tou ON td.id = tou.order_id
+        INNER JOIN trade_order_user tou ON td.id = tou.order_id AND tou.deleted = 0
         LEFT JOIN trade_detail tdl ON td.id = tdl.order_id AND tdl.deleted = 0
-        LEFT JOIN product_spu ps ON ps.id = tdl.product_id
-        LEFT JOIN trade_order_audit toa ON toa.order_id = td.id AND toa.audit_status = 1
+        LEFT JOIN product_spu ps ON ps.id = tdl.product_id and ps.deleted = 0
+        LEFT JOIN trade_order_audit toa ON toa.order_id = td.id AND toa.audit_status = 1 AND toa.deleted = 0
         LEFT JOIN (
         SELECT order_id,
         sum(refund_amount) refund_amount,
         sum(origin_amount) origin_amount
         FROM trade_refund
-        WHERE refund_status = 6 AND refund_method != 2
+        WHERE refund_status = 6 AND refund_method != 2 AND deleted = 0
         GROUP BY order_id
         ) tr ON td.id = tr.order_id
-        LEFT JOIN trade_insurance tins ON tins.order_id = td.id
+        LEFT JOIN trade_insurance tins ON tins.order_id = td.id AND tins.deleted = 0
         WHERE td.id IN
         <foreach collection="ids" item="id" open="(" close=")" separator=",">
             #{id}