Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-api-boot-master
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
lanbaoming
jiedao-api-boot-master
Commits
811de315
Commit
811de315
authored
Nov 28, 2024
by
zhengyi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
订单统计sql修正
parent
63e5f9e1
Changes
2
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
773 deletions
+16
-773
OrderMapper.java
...coder/yudao/module/order/dal/mysql/order/OrderMapper.java
+1
-758
OrderMapper.xml
...rder-core/src/main/resources/mapper/order/OrderMapper.xml
+15
-15
No files found.
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/mysql/order/OrderMapper.java
View file @
811de315
This diff is collapsed.
Click to expand it.
yudao-module-order/yudao-module-order-core/src/main/resources/mapper/order/OrderMapper.xml
View file @
811de315
...
...
@@ -6861,7 +6861,7 @@
op.`create_time` between #{query.beginPickUpTime} and #{query.endPickUpTime})
</if>
<if
test=
"query.beginWarehouseInTime != null and query.endWarehouseInTime != null "
>
AND o.order_id in(select distinct wi.order_id from ecw_order_warehouse_in wi where wi.deleted = 0 and
AND o.order_id in
(select distinct wi.order_id from ecw_order_warehouse_in wi where wi.deleted = 0 and
wi.`update_time` between #{query.beginWarehouseInTime} and #{query.endWarehouseInTime})
</if>
<if
test=
"query.salesmanId != null "
>
...
...
@@ -7405,10 +7405,10 @@
left join ecw_order_consignee nee on nee.order_id = o.order_id and nee.deleted = 0
left join ecw_channel channel on channel.channel_id = o.channel_id
<if
test=
"query.beginWarehouseInTime != null and query.endWarehouseInTime != null "
>
left join ecw_order_warehouse_in wi ON wi.order_i
d = o.order
_id and wi.deleted = 0
left join ecw_order_warehouse_in wi ON wi.order_i
tem_id = it.order_item
_id and wi.deleted = 0
</if>
<if
test=
"query.beginRucangTime != null and query.endRucangTime != null "
>
left join ecw_order_warehouse_in wi ON wi.order_i
d = o.order
_id and wi.deleted = 0
left join ecw_order_warehouse_in wi ON wi.order_i
tem_id = it.order_item
_id and wi.deleted = 0
</if>
where o.deleted = 0 and o.in_warehouse_state != 211 and o.in_warehouse_state != 208 and o.status != 10
<if
test =
"query.deptId != null "
>
...
...
@@ -7466,10 +7466,10 @@
left join ecw_order_consignee nee on nee.order_id = o.order_id
left join ecw_channel channel on channel.channel_id = o.channel_id
<if
test=
"query.beginWarehouseInTime != null and query.endWarehouseInTime != null "
>
left join ecw_order_warehouse_in wi ON wi.order_i
d = o.order
_id and wi.deleted = 0
left join ecw_order_warehouse_in wi ON wi.order_i
tem_id = it.order_item
_id and wi.deleted = 0
</if>
<if
test=
"query.beginRucangTime != null and query.endRucangTime != null "
>
left join ecw_order_warehouse_in wi ON wi.order_i
d = o.order
_id and wi.deleted = 0
left join ecw_order_warehouse_in wi ON wi.order_i
tem_id = it.order_item
_id and wi.deleted = 0
</if>
where o.deleted = 0 and o.in_warehouse_state != 211 and o.in_warehouse_state != 208 and o.status != 10
<if
test =
"query.deptId != null "
>
...
...
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