退款订单优化展示

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

@@ -22,6 +22,8 @@ public class RefundSearchParam implements Serializable {
 
     private String orderRefundCode;
 
+    private String orderCode;
+
     private Integer status;
 
     @ApiModelProperty(value = "页数", example = "0")

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

@@ -11,12 +11,12 @@
                 <div class="select-list">
                     <ul>
                         <li>
-                            <label>票务订单ID：</label>
+                            <label>订单ID：</label>
                             <input type="text" name="orderTicketsId"/>
                         </li>
                         <li>
-                            <label>退款编号：</label>
-                            <input type="text" name="orderRefundCode"/>
+                            <label>订单编号：</label>
+                            <input type="text" name="orderCode"/>
                         </li>
                         <li>
                             <label>退款状态：</label>
@@ -197,19 +197,15 @@
             },
                 {
                     field: 'orderRefundsId',
-                    title: '退款id'
+                    title: '退款ID'
                 },
                 {
                     field: 'orderTicketsId',
-                    title: '票务订单id'
+                    title: '订单ID'
                 },
                 {
-                    field: 'orderRefundCode',
-                    title: '退款编号'
-                },
-                {
-                    field: 'refundCode',
-                    title: '退款中心退款编号'
+                    field: 'orderCode',
+                    title: '订单编号'
                 },
                 {
                     field: 'price',

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinOrderRefundsServiceImpl.java

@@ -354,7 +354,7 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
             }
             pageInfoTmp = new PageInfo(voList);
         } catch (Exception e) {
-            return new PageInfo();
+            return new PageInfo(new ArrayList());
         }
         return pageInfoTmp;
     }

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

@@ -64,6 +64,8 @@ public class OrderRefundDao implements Serializable {
 
     private String updatedAt;
 
+    private String orderCode;
+
     public void setStatusName(Integer status){
         this.status=status;
         switch (status){

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

@@ -34,17 +34,18 @@
         <result column="created_at" property="createdAt"/>
     </resultMap>
     <select id="misRefundList" resultType="com.liquidnet.service.kylin.dao.OrderRefundDao" resultMap="misRefundListResult">
-        SELECT *
-        FROM kylin_order_refunds
+        SELECT a.*, b.order_code
+        FROM kylin_order_refunds AS a
+        JOIN kylin_order_tickets AS b ON a.order_tickets_id = b.order_tickets_id
         <where>
             <if test="orderTicketsId!=''">
-                AND order_tickets_id = #{orderTicketsId}
+                AND a.order_tickets_id = #{orderTicketsId}
             </if>
-            <if test="orderRefundCode!=''">
-                AND order_refund_code = #{orderRefundCode}
+            <if test="orderCode!=''">
+                AND b.order_code = #{orderCode}
             </if>
             <if test="status!=''">
-                AND status = #{status}
+                AND a.status = #{status}
             </if>
         </where>
     </select>