Commit aa308619 authored by hanfeng's avatar hanfeng

修改订单统计

parent 6b6c8927
...@@ -12,6 +12,7 @@ import lombok.Data; ...@@ -12,6 +12,7 @@ import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map;
@Data @Data
public class OrderListVo extends BaseOrder { public class OrderListVo extends BaseOrder {
...@@ -75,5 +76,5 @@ public class OrderListVo extends BaseOrder { ...@@ -75,5 +76,5 @@ public class OrderListVo extends BaseOrder {
/** /**
* 费用明细 * 费用明细
*/ */
private List<DetailsOfExpenses> detailsOfExpenses; private List<Map> detailsOfExpenses;
} }
...@@ -198,15 +198,13 @@ public class BackStageOrderController extends CommonBaseController implements Us ...@@ -198,15 +198,13 @@ public class BackStageOrderController extends CommonBaseController implements Us
String costDetail = orderPageVO.getOrderRentVehicleDetail().getCostDetail(); String costDetail = orderPageVO.getOrderRentVehicleDetail().getCostDetail();
ObjectMapper objectMapper = new ObjectMapper(); ObjectMapper objectMapper = new ObjectMapper();
try { try {
Map<String,String> map = objectMapper.readValue(costDetail, Map.class); Map<String,Object> map = objectMapper.readValue(costDetail, Map.class);
String paramJson = map.get("paramJson"); String paramJson = (String) map.get("paramJson");
if (StringUtil.isNotBlank(paramJson)){ if (StringUtil.isNotBlank(paramJson)){
RentVehiclePriceVO rentVehiclePriceVO = objectMapper.readValue(paramJson, RentVehiclePriceVO.class); RentVehiclePriceVO rentVehiclePriceVO = objectMapper.readValue(paramJson, RentVehiclePriceVO.class);
orderPageVO.setRentVehiclePriceVO(rentVehiclePriceVO); orderPageVO.setRentVehiclePriceVO(rentVehiclePriceVO);
} }
String childrenStr= map.get("children"); List<Map> children= (List<Map>) map.get("children");
List<DetailsOfExpenses> children = JSONObject.parseArray(childrenStr, DetailsOfExpenses.class);
orderPageVO.setDetailsOfExpenses(children); orderPageVO.setDetailsOfExpenses(children);
} catch (IOException e) { } catch (IOException e) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment