Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
order-group
Overview
Overview
Details
Activity
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
order-group-application
order-group
Commits
5e83e193
Commit
5e83e193
authored
Sep 22, 2021
by
蒋小洋
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
查询订单列表返回可开票金额
parent
d3d7d3e2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
0 deletions
+5
-0
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
+1
-0
order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderResponseVo.java
+4
-0
No files found.
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
View file @
5e83e193
...
@@ -1321,6 +1321,7 @@ public class OrderAdapter {
...
@@ -1321,6 +1321,7 @@ public class OrderAdapter {
//取餐码用日订单序号代替- v1.5.4变更为四位随机数
//取餐码用日订单序号代替- v1.5.4变更为四位随机数
responseVo
.
setTakeCode
(
ordersBean
.
getOtherCode
());
responseVo
.
setTakeCode
(
ordersBean
.
getOtherCode
());
responseVo
.
setAmount
(
ordersBean
.
getAmount
());
responseVo
.
setAmount
(
ordersBean
.
getAmount
());
responseVo
.
setActualPayAmount
(
orderBean
.
getActualPayAmount
());
OrderViewStatusDto
orderViewStatusDto
=
getOrderViewStatusDesc
(
ordersBean
,
wxAppId
);
OrderViewStatusDto
orderViewStatusDto
=
getOrderViewStatusDesc
(
ordersBean
,
wxAppId
);
//围餐需求 订单中存在未称重的商品称重商品则金额为0
//围餐需求 订单中存在未称重的商品称重商品则金额为0
if
(
IappIdType
.
WC_XCX
.
getCode
().
equals
(
iAppId
))
{
if
(
IappIdType
.
WC_XCX
.
getCode
().
equals
(
iAppId
))
{
...
...
order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderResponseVo.java
View file @
5e83e193
...
@@ -93,6 +93,10 @@ public class QueryOrderResponseVo {
...
@@ -93,6 +93,10 @@ public class QueryOrderResponseVo {
* 订单金额
* 订单金额
*/
*/
private
Long
amount
;
private
Long
amount
;
/*
* 实际支付金额,可开票金额
*/
private
Long
actualPayAmount
;
/**
/**
* 商品总金额 不包括满减,配送费,包装费
* 商品总金额 不包括满减,配送费,包装费
*/
*/
...
...
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