记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
董敬伟
liquidnet-bus-v1
Commits
96e33bde
Commit
96e33bde
authored
Nov 09, 2021
by
jiangxiulong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
快递相关列表排序
parent
1ffd9705
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
7 deletions
+5
-7
PerformancesExpressController.java
...troller/zhengzai/kylin/PerformancesExpressController.java
+0
-1
KylinOrderTicketsMapper.xml
...iquidnet.service.kylin.mapper/KylinOrderTicketsMapper.xml
+5
-6
No files found.
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/PerformancesExpressController.java
View file @
96e33bde
...
@@ -81,7 +81,6 @@ public class PerformancesExpressController extends BaseController {
...
@@ -81,7 +81,6 @@ public class PerformancesExpressController extends BaseController {
@ResponseBody
@ResponseBody
public
TableDataInfo
performanceOrderList
(
PerformanceExpressSearchAdminParam
performanceExpressSearchAdminParam
)
{
public
TableDataInfo
performanceOrderList
(
PerformanceExpressSearchAdminParam
performanceExpressSearchAdminParam
)
{
List
<
PerformanceExpressPerformanceOrderListAdminDao
>
orderList
=
performancesExpressServiceImpl
.
getPerformancesOrderList
(
performanceExpressSearchAdminParam
);
List
<
PerformanceExpressPerformanceOrderListAdminDao
>
orderList
=
performancesExpressServiceImpl
.
getPerformancesOrderList
(
performanceExpressSearchAdminParam
);
// List<PerformancesTicketListDao> ticketList = performancesExpressServiceImpl.getPerformancesTicketList(performanceExpressSearchAdminParam.getPerformancesId());
return
getDataTable
(
orderList
);
return
getDataTable
(
orderList
);
}
}
...
...
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderTicketsMapper.xml
View file @
96e33bde
...
@@ -313,10 +313,8 @@
...
@@ -313,10 +313,8 @@
FROM kylin_order_tickets kot
FROM kylin_order_tickets kot
INNER JOIN kylin_order_ticket_status kots ON kot.order_tickets_id = kots.order_id
INNER JOIN kylin_order_ticket_status kots ON kot.order_tickets_id = kots.order_id
INNER JOIN kylin_order_ticket_relations kotr ON kot.order_tickets_id = kotr.order_id
INNER JOIN kylin_order_ticket_relations kotr ON kot.order_tickets_id = kotr.order_id
LEFT JOIN (SELECT * FROM kylin_order_express WHERE express_status NOT IN (1, 3) AND send_type = 1) AS oe ON
LEFT JOIN (SELECT * FROM kylin_order_express WHERE express_status NOT IN (1, 3) AND send_type = 1) AS oe ON
oe.order_tickets_id =
oe.order_tickets_id = kot.order_tickets_id
kot.order_tickets_id
-- LEFT JOIN (SELECT * FROM kylin_order_express_route ORDER BY mid DESC LIMIT 1) AS oer ON oe.order_express_id =
-- LEFT JOIN (SELECT * FROM kylin_order_express_route ORDER BY mid DESC LIMIT 1) AS oer ON oe.order_express_id =
-- oer.order_express_id
-- oer.order_express_id
<where>
<where>
...
@@ -347,8 +345,8 @@
...
@@ -347,8 +345,8 @@
<if
test=
"expressStatus == 80"
>
AND (oe.express_status = 80 OR oe.express_status = 8000)
</if>
<if
test=
"expressStatus == 80"
>
AND (oe.express_status = 80 OR oe.express_status = 8000)
</if>
<if
test=
"mailno != ''"
>
AND oe.mailno LIKE concat('%', #{mailno}, '%')
</if>
<if
test=
"mailno != ''"
>
AND oe.mailno LIKE concat('%', #{mailno}, '%')
</if>
<if
test=
"ticketsId != '' and ticketsId != null"
>
AND kotr.ticket_id = ${ticketsId}
</if>
<if
test=
"ticketsId != '' and ticketsId != null"
>
AND kotr.ticket_id = ${ticketsId}
</if>
</where>
</where>
ORDER BY kot.mid DESC
</select>
</select>
<select
id=
"getCanPlaceOrderList"
resultType=
"com.liquidnet.service.kylin.entity.KylinOrderTickets"
>
<select
id=
"getCanPlaceOrderList"
resultType=
"com.liquidnet.service.kylin.entity.KylinOrderTickets"
>
SELECT
SELECT
...
@@ -364,7 +362,7 @@
...
@@ -364,7 +362,7 @@
AND kots.pay_status = 1
AND kots.pay_status = 1
AND kot.mid > ${mid}
AND kot.mid > ${mid}
</where>
</where>
ORDER BY mid ASC
ORDER BY
kot.
mid ASC
LIMIT ${limitNum}
LIMIT ${limitNum}
</select>
</select>
...
@@ -395,7 +393,8 @@
...
@@ -395,7 +393,8 @@
WHERE c.get_ticket_type = 'express'
WHERE c.get_ticket_type = 'express'
AND e.status = 1
AND e.status = 1
AND e.transfer_status in (0, 3)
AND e.transfer_status in (0, 3)
AND p.performances_id = #{performanceId};
AND p.performances_id = #{performanceId}
ORDER BY c.mid DESC;
</select>
</select>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment