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
8da97f39
Commit
8da97f39
authored
Aug 02, 2020
by
zhiheng.zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
聚合层取值修改为结算值
parent
00061707
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
order-application-service/src/main/java/cn/freemud/OrderApplication.java
+1
-1
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+2
-1
No files found.
order-application-service/src/main/java/cn/freemud/OrderApplication.java
View file @
8da97f39
...
@@ -38,7 +38,7 @@ import tk.mybatis.spring.annotation.MapperScan;
...
@@ -38,7 +38,7 @@ import tk.mybatis.spring.annotation.MapperScan;
@EnableSwagger2
@EnableSwagger2
@EnableCircuitBreaker
@EnableCircuitBreaker
@SpringBootApplication
@SpringBootApplication
@EnableDiscoveryClient
//
@EnableDiscoveryClient
@EnableAspectJAutoProxy
@EnableAspectJAutoProxy
@ComponentScan
({
"cn.freemud"
,
"com.freemud"
})
@ComponentScan
({
"cn.freemud"
,
"com.freemud"
})
@MapperScan
({
"cn.freemud.*.dao"
,
"com.freemud.sdk.api.assortment.orderdistributor.mapper"
,
"com.freemud.api.assortment.datamanager.manager"
,
@MapperScan
({
"cn.freemud.*.dao"
,
"com.freemud.sdk.api.assortment.orderdistributor.mapper"
,
"com.freemud.api.assortment.datamanager.manager"
,
...
...
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
View file @
8da97f39
...
@@ -84,6 +84,7 @@ import com.freemud.application.sdk.api.ordercenter.request.carpark.ParkingOrderC
...
@@ -84,6 +84,7 @@ import com.freemud.application.sdk.api.ordercenter.request.carpark.ParkingOrderC
import
com.freemud.application.sdk.api.ordercenter.response.carpark.OrderResp
;
import
com.freemud.application.sdk.api.ordercenter.response.carpark.OrderResp
;
import
com.freemud.application.sdk.api.ordercenter.response.BaseDownLoadResponse
;
import
com.freemud.application.sdk.api.ordercenter.response.BaseDownLoadResponse
;
import
com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs
;
import
com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs
;
import
com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderSettlementResp
;
import
com.freemud.application.sdk.api.ordercenter.service.OrderDownLoadSdkService
;
import
com.freemud.application.sdk.api.ordercenter.service.OrderDownLoadSdkService
;
import
com.freemud.application.sdk.api.ordercenter.service.OrderSdkService
;
import
com.freemud.application.sdk.api.ordercenter.service.OrderSdkService
;
import
com.freemud.application.sdk.api.paymentcenter.client.request.CodePayRequest
;
import
com.freemud.application.sdk.api.paymentcenter.client.request.CodePayRequest
;
...
@@ -2447,7 +2448,7 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -2447,7 +2448,7 @@ public class OrderServiceImpl implements Orderservice {
}
}
}
}
if
(
null
!=
orderBean
.
getOrderSettlementDetailList
()
&&
orderBean
.
getOrderSettlementDetailList
().
size
()>
0
){
if
(
null
!=
orderBean
.
getOrderSettlementDetailList
()
&&
orderBean
.
getOrderSettlementDetailList
().
size
()>
0
){
queryOrderByConditionsResponseVo
.
setSettlementAmount
(
orderBean
.
getOrderSettlementDetailList
().
get
(
0
).
getSettlementAmount
(
));
queryOrderByConditionsResponseVo
.
setSettlementAmount
(
orderBean
.
getOrderSettlementDetailList
().
stream
().
map
(
OrderSettlementResp:
:
getSettlementAmount
).
reduce
(
BigDecimal
.
ZERO
,
BigDecimal:
:
add
));
}
else
{
}
else
{
queryOrderByConditionsResponseVo
.
setSettlementAmount
(
BigDecimal
.
ZERO
);
queryOrderByConditionsResponseVo
.
setSettlementAmount
(
BigDecimal
.
ZERO
);
}
}
...
...
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