Merge branch 'master-modify-background-bug-hf' into base-modify

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderListVo.java

@@ -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<String,String>> detailsOfExpenses;
 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java

@@ -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<String,String>> children= (List<Map<String, String>>) map.get("children");
                     orderPageVO.setDetailsOfExpenses(children);
 
                 } catch (IOException e) {