Merge remote-tracking branch 'origin/dev_merchant' into pre

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

@@ -28,6 +28,8 @@ public class RefundSearchParam implements Serializable {
     private String getTicketType;
     private Integer type;
 
+    private Integer expressStatus;
+
     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

@@ -91,6 +91,17 @@
                                 </shiro:hasPermission>
                             </select>
                         </li>
+                        <li>
+                            <label>快递状态：</label>
+                            <select name="expressStatus">
+                                <option value="">所有</option>
+                                <option value="1">下单失败</option>
+                                <option value="2">已下单</option>
+                                <option value="3">已取消</option>
+                                <option value="70">运输中</option>
+                                <option value="80">已签收</option>
+                            </select>
+                        </li>
                         <li>
                             <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
                                     class="fa fa-search"></i>&nbsp;搜索</a>
@@ -363,7 +374,38 @@
                 },
                 {
                     field: 'mailno',
-                    title: '运单号'
+                    title: '运单信息',
+                    formatter: function (value, row) {
+                        if (row.type == 3 && null != value) {
+                            let sendExpressTypeName = "";
+                            if (row.sendExpressType == 1) {
+                                sendExpressTypeName = "上门取件";
+                            } else if (row.sendExpressType == 2) {
+                                sendExpressTypeName = "自主发货";
+                            } else {
+                                sendExpressTypeName = "未知";
+                            }
+
+                            let expressStatusName = "";
+                            if (row.expressStatus == 1) {
+                                expressStatusName = '<span style="color: red">下单失败</span>';
+                            } else if (row.expressStatus == 2) {
+                                expressStatusName = "已下单";
+                            } else if (row.expressStatus == 3) {
+                                expressStatusName = "已取消";
+                            } else if (row.expressStatus == 80) {
+                                expressStatusName = "已签收";
+                            } else if (row.expressStatus == 8000) {
+                                expressStatusName = "已签收";
+                            } else {
+                                expressStatusName = "运输中";
+                            }
+                            return value + '<br>' + sendExpressTypeName + '<br>' + expressStatusName + '<br>' + row.remark
+                        } else {
+                            return "";
+                        }
+
+                    }
                 },
                 {
                     field: 'refundError',

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

@@ -79,6 +79,10 @@ public class OrderRefundDao implements Serializable {
     private String getTicketType;
 
     private String mailno;
+    private Integer sendExpressType;
+    private Integer expressStatus;
+    private String remark;
+
 
     public void setStatusName(Integer status){
         this.status=status;

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

@@ -81,10 +81,17 @@
 
     <select id="misRefundList" resultType="com.liquidnet.service.kylin.dao.OrderRefundDao" resultMap="misRefundListResult">
         select t.*, b.order_code, b.performance_title, b.get_ticket_type from
-            (select a.*, d.mailno
+        (select a.*, d.mailno, d.send_express_type,d.remark,d.express_status
         from kylin_order_refunds a
         LEFT JOIN kylin_order_express AS d ON d.order_refunds_id = a.order_refunds_id
         <where>
+            <if test="expressStatus != '' and expressStatus != 70 and expressStatus != 80">AND d.express_status =
+                ${expressStatus}
+            </if>
+            <if test="expressStatus == 70">AND (d.express_status > 3 AND d.express_status != 80 AND d.express_status
+                != 8000)
+            </if>
+            <if test="expressStatus == 80">AND (d.express_status = 80 OR d.express_status = 8000)</if>
             <if test="orderTicketsId!=''">
                 AND a.order_tickets_id = #{orderTicketsId}
             </if>
@@ -136,7 +143,7 @@
                 AND b.get_ticket_type = #{getTicketType}
             </if>
         </where>
-        ORDER BY b.mid DESC
+        ORDER BY t.mid DESC
     </select>
 
     <select id="selectRefundingCount" resultType="java.lang.Integer">