Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
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
youjj
cloud-platform
Commits
5c68b6f4
Commit
5c68b6f4
authored
Jan 10, 2020
by
jiaorz
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master-invoice-modular' into dev
parents
bea92ed4
56409d2d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
0 deletions
+1
-0
BaseOrderController.java
...ava/com/xxfc/platform/order/rest/BaseOrderController.java
+1
-0
No files found.
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java
View file @
5c68b6f4
...
@@ -193,6 +193,7 @@ public class BaseOrderController extends CommonBaseController implements UserRes
...
@@ -193,6 +193,7 @@ public class BaseOrderController extends CommonBaseController implements UserRes
if
(
dto
.
getType
()
==
OrderTypeEnum
.
RENT_VEHICLE
.
getCode
())
{
if
(
dto
.
getType
()
==
OrderTypeEnum
.
RENT_VEHICLE
.
getCode
())
{
dto
.
setRefundStatus
(
3
);
dto
.
setRefundStatus
(
3
);
}
}
dto
.
setInvoiceStatus
(
0
);
Query
query
=
new
Query
(
dto
);
Query
query
=
new
Query
(
dto
);
PageDataVO
<
OrderPageVO
>
pages
=
PageDataVO
.
pageInfo
(
query
,
()
->
baseOrderBiz
.
pageByParm
(
query
.
getSuper
()));
PageDataVO
<
OrderPageVO
>
pages
=
PageDataVO
.
pageInfo
(
query
,
()
->
baseOrderBiz
.
pageByParm
(
query
.
getSuper
()));
pages
.
getData
().
parallelStream
().
forEach
(
data
->
{
pages
.
getData
().
parallelStream
().
forEach
(
data
->
{
...
...
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