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

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

@@ -376,6 +376,7 @@
                     field: 'mailno',
                     title: '运单信息',
                     formatter: function (value, row) {
+                        if (row.type == 3 && null != value) {
                             let sendExpressTypeName = "";
                             if (row.sendExpressType == 1) {
                                 sendExpressTypeName = "上门取件";
@@ -387,7 +388,7 @@
 
                             let expressStatusName = "";
                             if (row.expressStatus == 1) {
-                            expressStatusName = "下单失败";
+                                expressStatusName = '<span style="color: red">下单失败</span>';
                             } else if (row.expressStatus == 2) {
                                 expressStatusName = "已下单";
                             } else if (row.expressStatus == 3) {
@@ -400,6 +401,10 @@
                                 expressStatusName = "运输中";
                             }
                             return value + '<br>' + sendExpressTypeName + '<br>' + expressStatusName + '<br>' + row.remark
+                        } else {
+                            return "";
+                        }
+
                     }
                 },
                 {

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

@@ -85,13 +85,13 @@
         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 oe.express_status =
+            <if test="expressStatus != '' and expressStatus != 70 and expressStatus != 80">AND d.express_status =
                 ${expressStatus}
             </if>
-                <if test="expressStatus == 70">AND (oe.express_status > 3 AND oe.express_status != 80 AND oe.express_status
+            <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 (oe.express_status = 80 OR oe.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>
@@ -143,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">