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
aa308619
Commit
aa308619
authored
Nov 08, 2019
by
hanfeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改订单统计
parent
6b6c8927
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
6 deletions
+5
-6
OrderListVo.java
.../java/com/xxfc/platform/order/pojo/order/OrderListVo.java
+2
-1
BackStageOrderController.java
...om/xxfc/platform/order/rest/BackStageOrderController.java
+3
-5
No files found.
xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderListVo.java
View file @
aa308619
...
...
@@ -12,6 +12,7 @@ import lombok.Data;
import
java.math.BigDecimal
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.Map
;
@Data
public
class
OrderListVo
extends
BaseOrder
{
...
...
@@ -75,5 +76,5 @@ public class OrderListVo extends BaseOrder {
/**
* 费用明细
*/
private
List
<
DetailsOfExpenses
>
detailsOfExpenses
;
private
List
<
Map
>
detailsOfExpenses
;
}
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java
View file @
aa308619
...
...
@@ -198,15 +198,13 @@ public class BackStageOrderController extends CommonBaseController implements Us
String
costDetail
=
orderPageVO
.
getOrderRentVehicleDetail
().
getCostDetail
();
ObjectMapper
objectMapper
=
new
ObjectMapper
();
try
{
Map
<
String
,
String
>
map
=
objectMapper
.
readValue
(
costDetail
,
Map
.
class
);
String
paramJson
=
map
.
get
(
"paramJson"
);
Map
<
String
,
Object
>
map
=
objectMapper
.
readValue
(
costDetail
,
Map
.
class
);
String
paramJson
=
(
String
)
map
.
get
(
"paramJson"
);
if
(
StringUtil
.
isNotBlank
(
paramJson
)){
RentVehiclePriceVO
rentVehiclePriceVO
=
objectMapper
.
readValue
(
paramJson
,
RentVehiclePriceVO
.
class
);
orderPageVO
.
setRentVehiclePriceVO
(
rentVehiclePriceVO
);
}
String
childrenStr
=
map
.
get
(
"children"
);
List
<
DetailsOfExpenses
>
children
=
JSONObject
.
parseArray
(
childrenStr
,
DetailsOfExpenses
.
class
);
List
<
Map
>
children
=
(
List
<
Map
>)
map
.
get
(
"children"
);
orderPageVO
.
setDetailsOfExpenses
(
children
);
}
catch
(
IOException
e
)
{
...
...
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