|
|
@@ -1,12 +1,13 @@
|
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
|
|
<mapper namespace="com.zbkj.service.dao.ExpressOrderDao">
|
|
|
- <select id="getPlatformAdminPage" resultType="com.zbkj.common.response.PlatformOrderPageResponse" parameterType="Map">
|
|
|
+ <select id="getPlatformAdminPage" resultType="com.zbkj.common.response.express.PlatformExpressOrderPageResponse" parameterType="Map">
|
|
|
select o.order_no as orderNo, o.uid, o.pay_price as payPrice, o.pay_type as payType, o.paid,
|
|
|
o.status, o.is_user_del as isUserDel,
|
|
|
o.cancel_status as cancelStatus, o.type, o.create_time as createTime,
|
|
|
o.total_num as totalNum,
|
|
|
- u.nickname,u.is_logoff
|
|
|
+ o.total_price as totalPrice,
|
|
|
+ u.nickname,o.type
|
|
|
from eb_express_order o
|
|
|
left join eb_user as u on o.uid = u.id
|
|
|
where o.is_del = 0
|
|
|
@@ -15,22 +16,22 @@
|
|
|
and o.paid = 0 and o.status = 0 and o.cancel_status = 0 and o.is_user_del = 0
|
|
|
</when>
|
|
|
<when test='status == "notShipped"'>
|
|
|
- and o.status in (1,2) and o.cancel_status = 0 and o.refund_status <> 3 and o.is_user_del = 0
|
|
|
+ and o.status = 1 and o.cancel_status = 0 and o.is_user_del = 0
|
|
|
</when>
|
|
|
<when test='status == "spike"'>
|
|
|
- and o.status = 4 and o.cancel_status = 0 and o.refund_status <> 3 and o.is_user_del = 0
|
|
|
+ and o.status in (2,3) and o.cancel_status = 0 and o.is_user_del = 0
|
|
|
</when>
|
|
|
<when test='status == "receiving"'>
|
|
|
- and o.status = 5 and o.cancel_status = 0 and o.refund_status <> 3 and o.is_user_del = 0
|
|
|
+ and o.status = 4 and o.cancel_status = 0 and o.is_user_del = 0
|
|
|
</when>
|
|
|
<when test='status == "complete"'>
|
|
|
- and o.status = 6
|
|
|
+ and o.status = 5
|
|
|
</when>
|
|
|
<when test='status == "refunded"'>
|
|
|
- and o.paid = 1 and o.cancel_status = 0 and o.refund_status = 3 and o.is_user_del = 0
|
|
|
+ and o.paid = 1 and o.cancel_status = 0 and o.is_user_del = 0
|
|
|
</when>
|
|
|
<when test='status == "awaitVerification"'>
|
|
|
- and o.status = 3 and o.cancel_status = 0 and o.refund_status <> 3 and o.is_user_del = 0
|
|
|
+ and o.status = 3 and o.cancel_status = 0 and o.is_user_del = 0
|
|
|
</when>
|
|
|
<when test='status == "deleted"'>
|
|
|
and o.is_user_del = 1
|
|
|
@@ -76,22 +77,22 @@
|
|
|
and o.paid = 0 and o.status = 0 and o.cancel_status = 0 and o.is_user_del = 0
|
|
|
</when>
|
|
|
<when test='status == "notShipped"'>
|
|
|
- and o.status in (1,2) and o.cancel_status = 0 and o.refund_status <> 3 and o.is_user_del = 0
|
|
|
+ and o.status = 1 and o.cancel_status = 0 and o.is_user_del = 0
|
|
|
</when>
|
|
|
<when test='status == "spike"'>
|
|
|
- and o.status = 4 and o.cancel_status = 0 and o.refund_status <> 3 and o.is_user_del = 0
|
|
|
+ and o.status in (2,3) and o.cancel_status = 0 and o.is_user_del = 0
|
|
|
</when>
|
|
|
<when test='status == "receiving"'>
|
|
|
- and o.status = 5 and o.cancel_status = 0 and o.refund_status <> 3 and o.is_user_del = 0
|
|
|
+ and o.status = 4 and o.cancel_status = 0 and o.is_user_del = 0
|
|
|
</when>
|
|
|
<when test='status == "complete"'>
|
|
|
- and o.status = 6
|
|
|
+ and o.status = 5
|
|
|
</when>
|
|
|
<when test='status == "refunded"'>
|
|
|
- and o.paid = 1 and o.cancel_status = 0 and o.refund_status = 3 and o.is_user_del = 0
|
|
|
+ and o.paid = 1 and o.cancel_status = 0 and o.is_user_del = 0
|
|
|
</when>
|
|
|
<when test='status == "awaitVerification"'>
|
|
|
- and o.status = 3 and o.cancel_status = 0 and o.refund_status <> 3 and o.is_user_del = 0
|
|
|
+ and o.status = 3 and o.cancel_status = 0 and o.is_user_del = 0
|
|
|
</when>
|
|
|
<when test='status == "deleted"'>
|
|
|
and o.is_user_del = 1
|
