记得上下班打卡 | git大法好,push需谨慎

Commit 80b7b579 authored by jiangxiulong's avatar jiangxiulong

订单退款列表 去掉订单号搜索 增加 演出id搜素

parent cacf0ce1
...@@ -19,6 +19,7 @@ import java.time.LocalDateTime; ...@@ -19,6 +19,7 @@ import java.time.LocalDateTime;
@Data @Data
public class RefundSearchParam implements Serializable { public class RefundSearchParam implements Serializable {
private String orderTicketsId; private String orderTicketsId;
private String performancesId;
private String orderRefundCode; private String orderRefundCode;
......
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
<div class="select-list"> <div class="select-list">
<ul> <ul>
<li> <li>
<label>订单ID:</label> <label>演出ID:</label>
<input type="text" name="orderTicketsId"/> <input type="text" name="performancesId"/>
</li> </li>
<li> <li>
<label>订单编号:</label> <label>订单编号:</label>
...@@ -200,8 +200,8 @@ ...@@ -200,8 +200,8 @@
title: '退款ID' title: '退款ID'
}, },
{ {
field: 'orderTicketsId', field: 'performanceTitle',
title: '订单ID' title: '演出名称'
}, },
{ {
field: 'orderCode', field: 'orderCode',
......
...@@ -66,6 +66,8 @@ public class OrderRefundDao implements Serializable { ...@@ -66,6 +66,8 @@ public class OrderRefundDao implements Serializable {
private String orderCode; private String orderCode;
private String performanceTitle;
public void setStatusName(Integer status){ public void setStatusName(Integer status){
this.status=status; this.status=status;
switch (status){ switch (status){
......
...@@ -34,13 +34,17 @@ ...@@ -34,13 +34,17 @@
<result column="created_at" property="createdAt"/> <result column="created_at" property="createdAt"/>
</resultMap> </resultMap>
<select id="misRefundList" resultType="com.liquidnet.service.kylin.dao.OrderRefundDao" resultMap="misRefundListResult"> <select id="misRefundList" resultType="com.liquidnet.service.kylin.dao.OrderRefundDao" resultMap="misRefundListResult">
SELECT a.*, b.order_code SELECT a.*, b.order_code, b.performance_title
FROM kylin_order_refunds AS a FROM kylin_order_refunds AS a
JOIN kylin_order_tickets AS b ON a.order_tickets_id = b.order_tickets_id JOIN kylin_order_tickets AS b ON a.order_tickets_id = b.order_tickets_id
JOIN kylin_order_ticket_relations AS c ON a.order_tickets_id = c.order_id
<where> <where>
<if test="orderTicketsId!=''"> <if test="orderTicketsId!=''">
AND a.order_tickets_id = #{orderTicketsId} AND a.order_tickets_id = #{orderTicketsId}
</if> </if>
<if test="performancesId!=''">
AND c.performance_id = #{performancesId}
</if>
<if test="orderCode!=''"> <if test="orderCode!=''">
AND b.order_code = #{orderCode} AND b.order_code = #{orderCode}
</if> </if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment