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
b4e12422
Commit
b4e12422
authored
Jan 09, 2020
by
jiaorz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
发票
parent
fdbcafbc
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
22 additions
and
2 deletions
+22
-2
BaseOrderController.java
...ava/com/xxfc/platform/order/rest/BaseOrderController.java
+22
-2
No files found.
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java
View file @
b4e12422
...
...
@@ -173,12 +173,32 @@ public class BaseOrderController extends CommonBaseController implements UserRes
PageDataVO
<
OrderPageVO
>
pages
=
PageDataVO
.
pageInfo
(
query
,
()
->
baseOrderBiz
.
pageByParm
(
query
.
getSuper
()));
pages
.
getData
().
parallelStream
().
forEach
(
data
->
{
data
.
setQrcodeStr
(
qrcodePrefix
);
// data.setOrderRealAmount(data.getRealAmount().subtract(orderAccountBiz.getAllOrderCost(data.getId())));
// log.info("订单实际支付金额,扣除押金违章之后: {}", data.getOrderRealAmount());
});
return
new
ObjectRestResponse
<>().
data
(
pages
);
}
@RequestMapping
(
value
=
"/getInvoiceOrderList"
,
method
=
RequestMethod
.
GET
)
@ResponseBody
@ApiOperation
(
value
=
"发票订单列表"
)
@IgnoreClientToken
public
ObjectRestResponse
<
PageDataVO
<
OrderPageVO
>>
getInvoiceOrderList
(
QueryOrderDTO
dto
)
{
//查询列表数据
if
(
StringUtils
.
isBlank
(
BaseContextHandler
.
getUserID
()))
{
throw
new
BaseException
(
ResultCode
.
AJAX_WECHAT_NOTEXIST_CODE
);
}
//dto.setCrtUser(Integer.valueOf(BaseContextHandler.getUserID()));
dto
.
setUserId
(
Integer
.
valueOf
(
BaseContextHandler
.
getUserID
()));
Query
query
=
new
Query
(
dto
);
PageDataVO
<
OrderPageVO
>
pages
=
PageDataVO
.
pageInfo
(
query
,
()
->
baseOrderBiz
.
pageByParm
(
query
.
getSuper
()));
pages
.
getData
().
parallelStream
().
forEach
(
data
->
{
data
.
setQrcodeStr
(
qrcodePrefix
);
data
.
setOrderRealAmount
(
data
.
getRealAmount
().
subtract
(
orderAccountBiz
.
getAllOrderCost
(
data
.
getId
())));
log
.
info
(
"订单实际支付金额,扣除押金违章之后: {}"
,
data
.
getOrderRealAmount
());
});
return
new
ObjectRestResponse
<>().
data
(
pages
);
}
@ApiOperation
(
"查询个数"
)
@RequestMapping
(
value
=
"/count"
,
method
=
RequestMethod
.
GET
)
@ResponseBody
...
...
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