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
fd84a5e9
Commit
fd84a5e9
authored
Sep 17, 2019
by
hanfeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改订单统计
parent
91f4dd4b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
OrderStatistics.java
.../java/com/xxfc/platform/order/entity/OrderStatistics.java
+1
-1
OrderStatisticsBiz.java
.../java/com/xxfc/platform/order/biz/OrderStatisticsBiz.java
+1
-1
OrderStatisticsController.java
...form/order/rest/background/OrderStatisticsController.java
+1
-1
No files found.
xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/OrderStatistics.java
View file @
fd84a5e9
...
@@ -64,6 +64,6 @@ public class OrderStatistics {
...
@@ -64,6 +64,6 @@ public class OrderStatistics {
/**
/**
* 历史实际消费总额
* 历史实际消费总额
*/
*/
@ApiModelProperty
(
value
=
"实际消费总额"
)
@ApiModelProperty
(
value
=
"
历史
实际消费总额"
)
private
BigDecimal
totalExpenditure
;
private
BigDecimal
totalExpenditure
;
}
}
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderStatisticsBiz.java
View file @
fd84a5e9
...
@@ -56,7 +56,7 @@ public class OrderStatisticsBiz extends BaseBiz<OrderStatisticsMapper, OrderStat
...
@@ -56,7 +56,7 @@ public class OrderStatisticsBiz extends BaseBiz<OrderStatisticsMapper, OrderStat
OrderStatistics
member
=
membersBiz
.
findAll
(
companyId
);
OrderStatistics
member
=
membersBiz
.
findAll
(
companyId
);
if
(
vehicle
!=
null
)
{
if
(
vehicle
!=
null
)
{
HomePageOrderData
data
=
new
HomePageOrderData
()
{{
HomePageOrderData
data
=
new
HomePageOrderData
()
{{
setTotalOrders
(
member
.
getTotalGmv
()
.
subtract
(
member
.
getTotalReturnGmv
())
);
setTotalOrders
(
member
.
getTotalGmv
());
}};
}};
orderStatistics
.
add
(
data
);
orderStatistics
.
add
(
data
);
...
...
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/background/OrderStatisticsController.java
View file @
fd84a5e9
...
@@ -108,7 +108,7 @@ public class OrderStatisticsController extends BaseController<OrderStatisticsBiz
...
@@ -108,7 +108,7 @@ public class OrderStatisticsController extends BaseController<OrderStatisticsBiz
if
(
TYPE_MEMBER
.
equals
(
type
))
{
if
(
TYPE_MEMBER
.
equals
(
type
))
{
OrderStatistics
member
=
membersBiz
.
findAll
(
companyId
);
OrderStatistics
member
=
membersBiz
.
findAll
(
companyId
);
return
ObjectRestResponse
.
succ
(
new
HomePageOrderData
(){{
return
ObjectRestResponse
.
succ
(
new
HomePageOrderData
(){{
setTotalOrders
(
member
.
getTotalGmv
()
.
subtract
(
member
.
getTotalReturnGmv
())
);
setTotalOrders
(
member
.
getTotalGmv
());
}});
}});
}
}
...
...
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