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

Skip to content

L
liquidnet-bus-v1
Commit f2758142 authored by jiangxiulong's avatar jiangxiulong
Browse files
Options

运单信息

parent e4ecfff2
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 15 deletions
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/RefundSearchParam.java
View file @ f2758142
...@@ -28,6 +28,8 @@ public class RefundSearchParam implements Serializable { ...@@ -28,6 +28,8 @@ public class RefundSearchParam implements Serializable {
private String getTicketType; private String getTicketType;
private Integer type; private Integer type;
private Integer expressStatus;
private String status; private String status;
private List<String> statusStr; private List<String> statusStr;
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/refund/refund.html
View file @ f2758142
...@@ -21,19 +21,19 @@ ...@@ -21,19 +21,19 @@
<li> <li>
<label>取票方式：</label> <label>取票方式：</label>
<select name="getTicketType"> <select name="getTicketType">
<option value="">全部</option> <option value="">全部</option>
<option value="electronic">电子票</option> <option value="electronic">电子票</option>
<option value="express">快递票</option> <option value="express">快递票</option>
</select> </select>
</li> </li>
<li> <li>
<label>申请退款类型：</label> <label>申请退款类型：</label>
<select name="type"> <select name="type">
<option value="">全部</option> <option value="">全部</option>
<option value="4">客服申请</option> <option value="4">客服申请</option>
<option value="1">超时退款</option> <option value="1">超时退款</option>
<option value="2">用户申请普通退款</option> <option value="2">用户申请普通退款</option>
<option value="3">用户申请快递退款</option> <option value="3">用户申请快递退款</option>
</select> </select>
</li> </li>
<li> <li>
...@@ -91,6 +91,17 @@ ...@@ -91,6 +91,17 @@
</shiro:hasPermission> </shiro:hasPermission>
</select> </select>
</li> </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> <li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
class="fa fa-search"></i>&nbsp;搜索</a> class="fa fa-search"></i>&nbsp;搜索</a>
...@@ -368,7 +379,7 @@ ...@@ -368,7 +379,7 @@
let sendExpressTypeName = ""; let sendExpressTypeName = "";
if (row.sendExpressType == 1) { if (row.sendExpressType == 1) {
sendExpressTypeName = "上门取件"; sendExpressTypeName = "上门取件";
} else if(row.sendExpressType == 2) { } else if (row.sendExpressType == 2) {
sendExpressTypeName = "自主发货"; sendExpressTypeName = "自主发货";
} else { } else {
sendExpressTypeName = "未知"; sendExpressTypeName = "未知";
...@@ -377,12 +388,14 @@ ...@@ -377,12 +388,14 @@
let expressStatusName = ""; let expressStatusName = "";
if (row.expressStatus == 1) { if (row.expressStatus == 1) {
expressStatusName = "下单失败"; expressStatusName = "下单失败";
} else if(row.expressStatus == 2) { } else if (row.expressStatus == 2) {
if (row.sendExpressType == 1) { expressStatusName = "已下单";
expressStatusName = "已下单"; } else if (row.expressStatus == 3) {
} else if(row.sendExpressType == 2) { expressStatusName = "已取消";
expressStatusName = "运输中"; } else if (row.expressStatus == 80) {
} expressStatusName = "已签收";
} else if (row.expressStatus == 8000) {
expressStatusName = "已签收";
} else { } else {
expressStatusName = "运输中"; expressStatusName = "运输中";
} }
......
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderRefundsMapper.xml
View file @ f2758142
...@@ -85,6 +85,13 @@ ...@@ -85,6 +85,13 @@
from kylin_order_refunds a from kylin_order_refunds a
LEFT JOIN kylin_order_express AS d ON d.order_refunds_id = a.order_refunds_id LEFT JOIN kylin_order_express AS d ON d.order_refunds_id = a.order_refunds_id
<where> <where>
<if test="expressStatus != '' and expressStatus != 70 and expressStatus != 80">AND oe.express_status =
${expressStatus}
</if>
<if test="expressStatus == 70">AND (oe.express_status > 3 AND oe.express_status != 80 AND oe.express_status
!= 8000)
</if>
<if test="expressStatus == 80">AND (oe.express_status = 80 OR oe.express_status = 8000)</if>
<if test="orderTicketsId!=''"> <if test="orderTicketsId!=''">
AND a.order_tickets_id = #{orderTicketsId} AND a.order_tickets_id = #{orderTicketsId}
</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