订单列表支持房型楼层查询

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

@@ -226,4 +226,8 @@ public class TradeOrderPageReqVO extends PageParam {
 
     @Schema(description = "标签4", example = "张三")
     private String productTag4;
+
+
+    private String roomModelId;
+    private String floor;
 }

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

@@ -1805,6 +1805,10 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         //设置订单汇总数据
         TradeOrderTotalDO tradeOrderTotalDO = tradeOrderTotalMapper.selectOne(TradeOrderTotalDO::getOldOrderId, id);
         TradeOrderTotalVO summary = BeanUtils.toBean(tradeOrderTotalDO, TradeOrderTotalVO.class);
+        // 会为null，导致前端报错
+        if(summary == null) {
+            summary = new TradeOrderTotalVO();
+        }
         orderRespNewVO.setSummary(summary);
 
         //设置游轮航次信息

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

@@ -201,6 +201,7 @@
         LEFT JOIN ota_distributor od on od.id = td.source_id
         LEFT JOIN trade_order_audit toa on toa.order_id = td.id and toa.audit_status = 1
         LEFT JOIN (select m2.order_id,sum(m2.refund_amount) refund_amount,sum(m2.origin_amount) origin_amount from trade_refund m2  where m2.refund_status = 6 and m2.refund_method !=2 GROUP BY m2.order_id) tr on td.id = tr.order_id
+        LEFT JOIN trade_order_room_model torm on torm.order_id = td.id
         where td.deleted = 0 and tou.deleted = 0
         <if test="vo.orderStatus!=null and vo.orderStatus.size()>0">
             and  td.order_status in
@@ -351,6 +352,12 @@
         <if test="vo.travelStatus != null">
             AND td.travel_status = #{vo.travelStatus}
         </if>
+        <if test="vo.roomModelId != null">
+            AND torm.room_model_id = #{vo.roomModelId}
+        </if>
+        <if test="vo.floor != null">
+            AND torm.floor = #{vo.floor}
+        </if>
         <if test="vo.orderRefundDateStart != null and vo.orderRefundDateEnd != ''">
             AND exists (select 1 from trade_refund tr  where tr.order_id=td.id and tr.refund_status = 6 and tr.refund_time BETWEEN #{vo.orderRefundDateStart} and #{vo.orderRefundDateEnd} )
         </if>