列表增加 取票方式 申请退款类型

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/RefundSearchParam.java

@@ -25,6 +25,8 @@ public class RefundSearchParam implements Serializable {
     private String orderRefundCode;
 
     private String orderCode;
+    private String getTicketType;
+    private Integer type;
 
     private String status;
     private List<String> statusStr;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/refund/refund.html

@@ -18,6 +18,24 @@
                             <label>订单编号：</label>
                             <input type="text" name="orderCode"/>
                         </li>
+                        <li>
+                            <label>取票方式：</label>
+                            <select name="getTicketType">
+                                    <option value="">全部</option>
+                                    <option value="electronic">电子票</option>
+                                    <option value="express">快递票</option>
+                            </select>
+                        </li>
+                        <li>
+                            <label>申请退款类型：</label>
+                            <select name="type">
+                                    <option value="">全部</option>
+                                    <option value="0">客服申请</option>
+                                    <option value="1">超时退款</option>
+                                    <option value="2">用户申请普通退款</option>
+                                    <option value="3">用户申请快递退款</option>
+                            </select>
+                        </li>
                         <li>
                             <label>退款状态：</label>
                             <select name="status">
@@ -114,7 +132,8 @@
             <a class="btn btn-primary multiple disabled" onclick="execute()" shiro:hasPermission="kylin:refund:execute">
                 财务审核
             </a>
-            <a class="btn btn-success multiple disabled" onclick="ticketAudit()" shiro:hasPermission="kylin:refund:ticketAudit">
+            <a class="btn btn-success multiple disabled" onclick="ticketAudit()"
+               shiro:hasPermission="kylin:refund:ticketAudit">
                 票务审核
             </a>
             <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll('确定取消选中的退款申请吗？', 'refund/cancel')"
@@ -225,7 +244,8 @@
                 $.operate.save(prefix + "/ticketAudit", data);
                 layer.close(index)
             },
-            btn2: function (index, layero) {}
+            btn2: function (index, layero) {
+            }
         });
     }
 
@@ -286,6 +306,37 @@
                     field: 'orderCode',
                     title: '订单编号'
                 },
+                {
+                    field: 'getTicketType',
+                    title: '取票方式',
+                    formatter: function (value, row, index) {
+                        if (row.getTicketType == "electronic") {
+                            return "电子票";
+                        } else {
+                            return '快递票';
+                        }
+                    },
+                },
+                {
+                    field: 'type',
+                    title: '申请退款类型',
+                    formatter: function (value, row, index) {
+                        switch (row.type) {
+                            case 0:
+                                return "客服申请";
+                                break;
+                            case 1:
+                                return "超时退款";
+                                break;
+                            case 2:
+                                return "用户申请普通退款";
+                                break;
+                            case 3:
+                                return "用户申请快递退款";
+                                break;
+                        }
+                    },
+                },
                 {
                     field: 'price',
                     title: '退票金额'

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/OrderRefundDao.java

@@ -76,6 +76,8 @@ public class OrderRefundDao implements Serializable {
 
     private String performanceTitle;
 
+    private String getTicketType;
+
     private String mailno;
 
     public void setStatusName(Integer status){

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderRefundsMapper.xml

@@ -80,7 +80,7 @@
     </select>
 
     <select id="misRefundList" resultType="com.liquidnet.service.kylin.dao.OrderRefundDao" resultMap="misRefundListResult">
-        select t.*, b.order_code, b.performance_title from
+        select t.*, b.order_code, b.performance_title, b.get_ticket_type from
             (select a.*, d.mailno
             from kylin_order_refunds a
             LEFT JOIN kylin_order_express AS d ON d.order_refunds_id = a.order_refunds_id
@@ -88,6 +88,9 @@
                 <if test="orderTicketsId!=''">
                     AND a.order_tickets_id = #{orderTicketsId}
                 </if>
+                <if test="type!=''">
+                    AND a.type = #{type}
+                </if>
                 <choose>
                     <when test="roleType!=''">
                         <if test="roleType == 1">
@@ -126,6 +129,9 @@
             <if test="orderCode!=''">
                 AND b.order_code = #{orderCode}
             </if>
+            <if test="getTicketType!=''">
+                AND b.get_ticket_type = #{getTicketType}
+            </if>
         </where>
     </select>