修改订单统计

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

+package com.xxfc.platform.order.pojo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 费用明细
+ * @author Administrator
+ */
+@Data
+public class DetailsOfExpenses {
+    private String key;
+    private String detail;
+    private BigDecimal val =BigDecimal.ZERO;
+}
+

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

@@ -2,7 +2,9 @@ package com.xxfc.platform.order.pojo.order;
 
 import com.xxfc.platform.activity.entity.Coupon;
 import com.xxfc.platform.order.entity.*;
+import com.xxfc.platform.order.pojo.DetailsOfExpenses;
 import com.xxfc.platform.order.pojo.OrderAccompanyDTO;
+import com.xxfc.platform.order.pojo.price.RentVehiclePriceVO;
 import com.xxfc.platform.vehicle.entity.VehicleUserLicense;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -64,4 +66,14 @@ public class OrderListVo extends BaseOrder {
 
     @ApiModelProperty(value = "退还优惠卷")
     List<Coupon> backCouponList;
+
+    /**
+     * 费用详情
+     */
+    private RentVehiclePriceVO rentVehiclePriceVO;
+
+    /**
+     * 费用明细
+     */
+    private List<DetailsOfExpenses> detailsOfExpenses;
 }

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

@@ -16,7 +16,7 @@ public class OrderPriceVO {
     public BigDecimal realAmount = BigDecimal.ZERO;
     @ApiModelProperty(value = "优惠券扣除的费用")
     public BigDecimal couponAmount = BigDecimal.ZERO;
-    @ApiModelProperty(value = "优惠券扣除的费用")
+    @ApiModelProperty(value = "优惠券描述")
     public String couponDesc = "";
 
     @ApiModelProperty(value = "参数json")

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

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 @Data
 public class RentVehiclePriceVO extends OrderPriceVO{
@@ -15,9 +16,9 @@ public class RentVehiclePriceVO extends OrderPriceVO{
     BigDecimal damageSafeAmount = BigDecimal.ZERO;
     @ApiModelProperty(value = "押金价格")
     BigDecimal deposit = BigDecimal.ZERO;
-    @ApiModelProperty(value = "天数")
+    @ApiModelProperty(value = "总天数")
     Integer dayNum = 0;
-    @ApiModelProperty(value = "车辆天数")
+    @ApiModelProperty(value = "扣除免费天数后的车辆天数")
     Integer vehicleDayNum = 0;
     @ApiModelProperty(value = "车辆个数")
     Integer vehicleNum = 0;

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

@@ -3,7 +3,9 @@ package com.xxfc.platform.order.rest;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.json.JSONUtil;
+import com.alibaba.druid.sql.visitor.functions.If;
 import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
@@ -28,8 +30,10 @@ import com.xxfc.platform.order.biz.OrderUserLicenseBiz;
 import com.xxfc.platform.order.contant.enumerate.ItemTypeEnum;
 import com.xxfc.platform.order.entity.OrderItem;
 import com.xxfc.platform.order.entity.OrderRentVehicleDetail;
+import com.xxfc.platform.order.pojo.DetailsOfExpenses;
 import com.xxfc.platform.order.pojo.OrderAccompanyDTO;
 import com.xxfc.platform.order.pojo.order.*;
+import com.xxfc.platform.order.pojo.price.RentVehiclePriceVO;
 import com.xxfc.platform.order.service.OrderRentVehicleService;
 import com.xxfc.platform.tour.entity.TourUser;
 import com.xxfc.platform.tour.feign.TourFeign;
@@ -43,6 +47,7 @@ import com.xxfc.platform.vehicle.pojo.BookVehicleVO;
 import com.xxfc.platform.vehicle.pojo.CompanyDetail;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import jodd.util.StringUtil;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
@@ -54,6 +59,7 @@ import org.springframework.web.bind.annotation.*;
 import tk.mybatis.mapper.entity.Example;
 
 import javax.annotation.Resource;
+import java.io.IOException;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
@@ -162,6 +168,7 @@ public class BackStageOrderController extends CommonBaseController implements Us
         }
         Query query = new Query(dto);
         PageDataVO pageDataVO = PageDataVO.pageInfo(query, () -> baseOrderBiz.listOrder(query.getSuper()));
+
         List<OrderListVo> list = pageDataVO.getData();
         List<Integer> userIds = list.stream().map(OrderListVo::getUserId).distinct().collect(Collectors.toList());
         if (userIds != null && userIds.size() > 0) {
@@ -187,6 +194,24 @@ public class BackStageOrderController extends CommonBaseController implements Us
                     orderPageVO.setMemberName(appUserVo.getMemberName());
                 }
 
+
+                String costDetail = orderPageVO.getOrderRentVehicleDetail().getCostDetail();
+                ObjectMapper objectMapper = new ObjectMapper();
+                try {
+                    Map<String,String> map = objectMapper.readValue(costDetail, Map.class);
+                    String paramJson = 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);
+                    orderPageVO.setDetailsOfExpenses(children);
+
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
                 if (dto.getType()==1) {
                     if (StringUtils.isNotBlank(orderPageVO.getCouponTickerNos())) {
                         String[] couponIds = orderPageVO.getCouponTickerNos().split(",");