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

Skip to content

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

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

parents ab382d9f aabf1628
Hide whitespace changes
Inline Side-by-side
Showing with 104 additions and 49 deletions
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/RefundSearchParam.java
View file @ cf2262f6
...@@ -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 @ cf2262f6
...@@ -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>
...@@ -363,7 +374,38 @@ ...@@ -363,7 +374,38 @@
}, },
{ {
field: 'mailno', 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', field: 'refundError',
......
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/OrderRefundDao.java
View file @ cf2262f6
...@@ -79,6 +79,10 @@ public class OrderRefundDao implements Serializable { ...@@ -79,6 +79,10 @@ public class OrderRefundDao implements Serializable {
private String getTicketType; private String getTicketType;
private String mailno; private String mailno;
private Integer sendExpressType;
private Integer expressStatus;
private String remark;
public void setStatusName(Integer status){ public void setStatusName(Integer status){
this.status=status; this.status=status;
......
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderRefundsMapper.xml
View file @ cf2262f6
...@@ -81,48 +81,55 @@ ...@@ -81,48 +81,55 @@
<select id="misRefundList" resultType="com.liquidnet.service.kylin.dao.OrderRefundDao" resultMap="misRefundListResult"> <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 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 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="orderTicketsId!=''"> <if test="expressStatus != '' and expressStatus != 70 and expressStatus != 80">AND d.express_status =
AND a.order_tickets_id = #{orderTicketsId} ${expressStatus}
</if> </if>
<if test="type!='' and type != 4"> <if test="expressStatus == 70">AND (d.express_status > 3 AND d.express_status != 80 AND d.express_status
AND a.type = #{type} != 8000)
</if> </if>
<if test="type!='' and type == 4"> <if test="expressStatus == 80">AND (d.express_status = 80 OR d.express_status = 8000)</if>
AND a.type = 0 <if test="orderTicketsId!=''">
</if> AND a.order_tickets_id = #{orderTicketsId}
<choose> </if>
<when test="roleType!=''"> <if test="type!='' and type != 4">
<if test="roleType == 1"> AND a.type = #{type}
AND a.type = 3 AND a.status = 1 </if>
<if test="type!='' and type == 4">
AND a.type = 0
</if>
<choose>
<when test="roleType!=''">
<if test="roleType == 1">
AND a.type = 3 AND a.status = 1
</if>
<if test="roleType == 2">
<if test="statusStr == '9'">
AND a.status = 9
</if> </if>
<if test="roleType == 2"> <if test="statusStr != '1'">
<if test="statusStr == '9'"> AND a.status = 1 AND a.type != 3
AND a.status = 9
</if>
<if test="statusStr != '1'">
AND a.status = 1 AND a.type != 3
</if>
<if test="statusStr != '1' and statusStr != '9'">
AND (a.status = 9 OR (a.status = 1 AND a.type != 3)
</if>
</if> </if>
</when> <if test="statusStr != '1' and statusStr != '9'">
<otherwise> AND (a.status = 9 OR (a.status = 1 AND a.type != 3)
<if test="status!=''">
AND a.status IN
<foreach collection="statusStr" item="status" index="index" open="(" close=")" separator=",">
${status}
</foreach>
</if> </if>
</otherwise> </if>
</choose> </when>
</where> <otherwise>
ORDER BY a.mid DESC <if test="status!=''">
) t AND a.status IN
<foreach collection="statusStr" item="status" index="index" open="(" close=")" separator=",">
${status}
</foreach>
</if>
</otherwise>
</choose>
</where>
ORDER BY a.mid DESC
) t
JOIN kylin_order_tickets AS b ON t.order_tickets_id = b.order_tickets_id JOIN kylin_order_tickets AS b ON t.order_tickets_id = b.order_tickets_id
JOIN kylin_order_ticket_relations AS c ON t.order_tickets_id = c.order_id JOIN kylin_order_ticket_relations AS c ON t.order_tickets_id = c.order_id
<where> <where>
...@@ -136,7 +143,7 @@ ...@@ -136,7 +143,7 @@
AND b.get_ticket_type = #{getTicketType} AND b.get_ticket_type = #{getTicketType}
</if> </if>
</where> </where>
ORDER BY b.mid DESC ORDER BY t.mid DESC
</select> </select>
<select id="selectRefundingCount" resultType="java.lang.Integer"> <select id="selectRefundingCount" resultType="java.lang.Integer">
......
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