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

Skip to content

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

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

parents fa51982b 7b639ae5
Hide whitespace changes
Inline Side-by-side
Showing with 73 additions and 68 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/refund/refund.html
View file @ aabf1628
...@@ -376,30 +376,35 @@ ...@@ -376,30 +376,35 @@
field: 'mailno', field: 'mailno',
title: '运单信息', title: '运单信息',
formatter: function (value, row) { formatter: function (value, row) {
let sendExpressTypeName = ""; if (row.type == 3 && null != value) {
if (row.sendExpressType == 1) { let sendExpressTypeName = "";
sendExpressTypeName = "上门取件"; if (row.sendExpressType == 1) {
} else if (row.sendExpressType == 2) { sendExpressTypeName = "上门取件";
sendExpressTypeName = "自主发货"; } else if (row.sendExpressType == 2) {
} else { sendExpressTypeName = "自主发货";
sendExpressTypeName = "未知"; } else {
} sendExpressTypeName = "未知";
}
let expressStatusName = ""; let expressStatusName = "";
if (row.expressStatus == 1) { if (row.expressStatus == 1) {
expressStatusName = "下单失败"; expressStatusName = '<span style="color: red">下单失败</span>';
} else if (row.expressStatus == 2) { } else if (row.expressStatus == 2) {
expressStatusName = "已下单"; expressStatusName = "已下单";
} else if (row.expressStatus == 3) { } else if (row.expressStatus == 3) {
expressStatusName = "已取消"; expressStatusName = "已取消";
} else if (row.expressStatus == 80) { } else if (row.expressStatus == 80) {
expressStatusName = "已签收"; expressStatusName = "已签收";
} else if (row.expressStatus == 8000) { } else if (row.expressStatus == 8000) {
expressStatusName = "已签收"; expressStatusName = "已签收";
} else {
expressStatusName = "运输中";
}
return value + '<br>' + sendExpressTypeName + '<br>' + expressStatusName + '<br>' + row.remark
} else { } else {
expressStatusName = "运输中"; return "";
} }
return value + '<br>' + sendExpressTypeName + '<br>' + expressStatusName + '<br>' + row.remark
} }
}, },
{ {
......
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderRefundsMapper.xml
View file @ aabf1628
...@@ -81,55 +81,55 @@ ...@@ -81,55 +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, d.send_express_type,d.remark,d.express_status (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="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} ${expressStatus}
</if> </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) != 8000)
</if> </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!=''"> <if test="orderTicketsId!=''">
AND a.order_tickets_id = #{orderTicketsId} AND a.order_tickets_id = #{orderTicketsId}
</if> </if>
<if test="type!='' and type != 4"> <if test="type!='' and type != 4">
AND a.type = #{type} AND a.type = #{type}
</if> </if>
<if test="type!='' and type == 4"> <if test="type!='' and type == 4">
AND a.type = 0 AND a.type = 0
</if> </if>
<choose> <choose>
<when test="roleType!=''"> <when test="roleType!=''">
<if test="roleType == 1"> <if test="roleType == 1">
AND a.type = 3 AND a.status = 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>
...@@ -143,7 +143,7 @@ ...@@ -143,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