Explorar el Código

fix: 退票管理与退款管理界面,搜索项需增加游轮名称,航线,航次搜索

luofeiyun hace 4 días
padre
commit
c0d3798af7

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

@@ -105,4 +105,13 @@ public class RefundPageReqVO extends PageParam {
     @Schema(description = "分组列")
     private List<Long> cateIds;
 
+    @Schema(description = "船ID")
+    private Long shipId;
+
+    @Schema(description = "线路ID")
+    private Long routeId;
+
+    @Schema(description = "航次ID")
+    private Long voyageId;
+
 }

+ 9 - 0
ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/order/vo/refund/RefundRecordPageReqVO.java

@@ -89,4 +89,13 @@ public class RefundRecordPageReqVO extends PageParam {
 
     @Schema(description = "来源ID")
     private String sourceId;
+
+    @Schema(description = "船ID")
+    private Long shipId;
+
+    @Schema(description = "线路ID")
+    private Long routeId;
+
+    @Schema(description = "航次ID")
+    private Long voyageId;
 }

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

@@ -1083,9 +1083,19 @@
         SELECT tr.*,td.order_no, ou.mobile,td.travel_date, ou.contact_name ,tdl.product_name
         FROM trade_refund tr
         INNER JOIN  trade_order td on tr.order_id = td.id
+        inner join product_voyage pv on td.voyage_id = pv.id
         inner join trade_order_user ou on ou.order_id = td.id
         INNER JOIN trade_detail tdl on td.id = tdl.order_id  and tdl.deleted = 0
         where 1= 1
+        <if test="vo.shipId != null and vo.shipId != ''">
+            AND td.ship_id = #{vo.shipId}
+        </if>
+        <if test="vo.voyageId != null and vo.voyageId != ''">
+            AND td.voyage_id = #{vo.voyageId}
+        </if>
+        <if test="vo.routeId != null and vo.routeId != ''">
+            AND pv.route_id = #{vo.routeId}
+        </if>
         <if test="vo.orderNo != null and vo.orderNo != ''">
             AND td.order_no = #{vo.orderNo}
         </if>
@@ -1419,7 +1429,17 @@
         left join trade_order_pay top on trr.order_pay_id = top.id
         left join trade_refund tr on trr.refund_id = tr.id
         left join trade_order td on td.id = top.order_id
+        left join product_voyage pv on td.voyage_id = pv.id
         where 1= 1
+        <if test="vo.shipId != null and vo.shipId != ''">
+            AND td.ship_id = #{vo.shipId}
+        </if>
+        <if test="vo.voyageId != null and vo.voyageId != ''">
+            AND td.voyage_id = #{vo.voyageId}
+        </if>
+        <if test="vo.routeId != null and vo.routeId != ''">
+            AND pv.route_id = #{vo.routeId}
+        </if>
         <if test="vo.orderNo != null and vo.orderNo != ''">
             AND td.order_no = #{vo.orderNo}
         </if>