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
00061707
Commit
00061707
authored
Aug 02, 2020
by
zhiheng.zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
聚合层取值修改为结算值
parent
d455c1f9
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
0 deletions
+7
-0
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+7
-0
No files found.
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
View file @
00061707
...
...
@@ -139,6 +139,7 @@ import org.springframework.stereotype.Service;
import
tk.mybatis.mapper.util.StringUtil
;
import
java.lang.reflect.InvocationTargetException
;
import
java.math.BigDecimal
;
import
java.text.SimpleDateFormat
;
import
java.util.*
;
import
java.util.concurrent.TimeUnit
;
...
...
@@ -2445,6 +2446,12 @@ public class OrderServiceImpl implements Orderservice {
imgUrl
.
add
(
String
.
valueOf
(
jsonArray
.
get
(
i
)));
}
}
if
(
null
!=
orderBean
.
getOrderSettlementDetailList
()
&&
orderBean
.
getOrderSettlementDetailList
().
size
()>
0
){
queryOrderByConditionsResponseVo
.
setSettlementAmount
(
orderBean
.
getOrderSettlementDetailList
().
get
(
0
).
getSettlementAmount
());
}
else
{
queryOrderByConditionsResponseVo
.
setSettlementAmount
(
BigDecimal
.
ZERO
);
}
queryOrderByConditionsResponseVo
.
setSettlementAmount
(
orderBean
.
getOrderSettlementDetailList
().
get
(
0
).
getSettlementAmount
());
queryOrderByConditionsResponseVo
.
setImgUrl
(
imgUrl
);
queryOrderByConditionsResponseVo
.
setOrderStateValue
(
orderSdkAdapter
.
getOrderStatusValue
(
orderBean
.
getOrderState
()));
SimpleDateFormat
sdff
=
new
SimpleDateFormat
(
"yyyy-MM-dd HH:mm:ss"
);
...
...
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