修改订单统计

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

@@ -3,6 +3,7 @@ package com.xxfc.platform.order.pojo.order;
 import com.xxfc.platform.activity.entity.Coupon;
 import com.xxfc.platform.order.entity.DepositRefundRecord;
 import com.xxfc.platform.order.entity.OrderVehicleCrosstown;
+import com.xxfc.platform.order.pojo.DedDetailDTO;
 import lombok.Data;
 
 import java.util.Date;
@@ -64,4 +65,14 @@ public class OrderVehicleCrosstownDto extends OrderVehicleCrosstown {
      */
     private List<Coupon> backCoupons;
 
+
+    private List<DedDetailDTO> dedDetailDTOList;
+
+    private List<DedDetailDTO> violateDetailList;
+
+
+    private String types;
+
+    private List<String> typeList;
+
 }
\ No newline at end of file

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderVehicleCrosstownBiz.java

@@ -3,6 +3,7 @@ package com.xxfc.platform.order.biz;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
@@ -20,6 +21,7 @@ import com.xxfc.platform.order.contant.enumerate.DepositRefundStatus;
 import com.xxfc.platform.order.contant.enumerate.OrderStatusEnum;
 import com.xxfc.platform.order.entity.*;
 import com.xxfc.platform.order.mapper.OrderVehicaleCrosstownMapper;
+import com.xxfc.platform.order.pojo.DedDetailDTO;
 import com.xxfc.platform.order.pojo.mq.OrderMQDTO;
 import com.xxfc.platform.order.pojo.order.OrderPageVO;
 import com.xxfc.platform.order.pojo.order.OrderVehicleCrosstownDto;
@@ -37,6 +39,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.map.HashedMap;
 import org.apache.commons.lang3.StringUtils;
+import org.assertj.core.util.Lists;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -86,7 +89,10 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
     public static final DateTimeFormatter DEFAULT_DATE_TIME_FORMATTER = DateTimeFormat.forPattern("yyyy-MM-dd");
 
     public List<OrderVehicleCrosstownDto> selectByOrderId(OrderVehicleCrosstownDto orderVehicleCrosstownDto) {
-
+        if (StringUtils.isNotBlank(orderVehicleCrosstownDto.getTypes())) {
+            String[] types = orderVehicleCrosstownDto.getTypes().split(",");
+            orderVehicleCrosstownDto.setTypeList(Lists.newArrayList(types));
+        }
         List<OrderVehicleCrosstownDto> list = mapper.selectByOrderId(orderVehicleCrosstownDto);
         for (OrderVehicleCrosstownDto value : list) {
             if (value != null && value.getOrperaterId() != null && value.getType() != 1) {
@@ -103,6 +109,14 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                 value.setBackCoupons(c);
 
             }
+            if (StringUtils.isNotBlank(value.getDedDetail())) {
+                List<DedDetailDTO> dddList = JSONUtil.toList(JSONUtil.parseArray(value.getDedDetail()), DedDetailDTO.class);
+                value.setDedDetailDTOList(dddList);
+            }
+            if (StringUtils.isNotBlank(value.getViolateDetail())) {
+                List<DedDetailDTO> dddList = JSONUtil.toList(JSONUtil.parseArray(value.getViolateDetail()), DedDetailDTO.class);
+                value.setViolateDetailList(dddList);
+            }
             updateCrossRecord(value);
             List<DepositRefundRecord> depositRefundRecords = orderDepositRefundRecordBiz.selectByCrossId(value.getId());
             value.setDepositRefundRecord(depositRefundRecords == null || depositRefundRecords.size() <= 0 ? null : depositRefundRecords);

xx-order/xx-order-server/src/main/resources/mapper/OrderVehicaleCrosstownMapper.xml

@@ -51,6 +51,12 @@
             <if test="orderNo != null">
                 and o.order_no = #{orderNo}
             </if>
+            <if test="typeList != null and typeList.size() != 0">
+                and o.type in
+                <foreach collection="typeList" item="type" index="index" open="(" separator="," close=")">
+                    #{type}
+                </foreach>
+            </if>
         </where>
     </select>
     <select id="selectByOrderNo" parameterType="java.util.Map" resultType="com.xxfc.platform.order.pojo.order.OrderVehicleCrosstownDto">