Merge branch 'order_received_statistics' into dev

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/contant/enumerate/OrderReceivedStatisticsSignEnum.java

@@ -6,7 +6,6 @@ import com.xxfc.platform.order.pojo.vo.OrderReceivedStatisticsVo;
 
 import java.math.BigDecimal;
 import java.util.*;
-import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/contant/enumerate/ReceivedStatisticsEnum.java

 package com.xxfc.platform.order.contant.enumerate;
 
+import cn.hutool.core.date.DateUtil;
 import com.xxfc.platform.order.entity.OrderReceivedStatisticsBase;
 import com.xxfc.platform.order.pojo.vo.OrderReceivedStatisticsVo;
 import org.springframework.util.CollectionUtils;
@@ -29,6 +30,7 @@ public enum ReceivedStatisticsEnum {
             }
             return orderReceivedStatisticsBases.stream().peek(x -> {
                 ((OrderReceivedStatisticsBase) x).setDivisor(1);
+                ((OrderReceivedStatisticsBase) x).setDateStr(DateUtil.format(((OrderReceivedStatisticsBase) x).getDate(),"yyyy-MM-dd"));
             }).collect(Collectors.groupingBy(OrderReceivedStatisticsBase::getDate, Collectors.toList()));
         }
     },

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/OrderReceivedStatisticsBase.java

@@ -118,4 +118,7 @@ public class OrderReceivedStatisticsBase implements Serializable {
     @Transient
     private String stateGroup;
 
+    @Transient
+    private String dateStr;
+
 }

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

@@ -7,7 +7,6 @@ import com.google.common.collect.Lists;
 import com.xxfc.platform.order.bo.FeeTypeBo;
 import com.xxfc.platform.order.contant.enumerate.StatisticsStatusEnum;
 import com.xxfc.platform.order.entity.OrderMemberReceivedStatistics;
-import com.xxfc.platform.order.entity.OrderReceivedStatisticsBase;
 import com.xxfc.platform.order.mapper.OrderMemberReceivedStatisticsMapper;
 import com.xxfc.platform.order.pojo.account.OrderAccountBo;
 import com.xxfc.platform.order.pojo.dto.OrderDTO;
@@ -46,21 +45,15 @@ public class OrderMemberReceivedStatisticsBiz extends BaseBiz<OrderMemberReceive
      * @return
      */
     public List<OrderMemberReceivedStatistics> selectOrderReceivedStatisticsGroupByDate(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO) {
-        List<OrderMemberReceivedStatistics> orderMemberReceivedStatisticsList = mapper.selectOrderMemberReceivedStatisticsGroupByDate(orderReceivedStatisticsFindDTO);
-        return CollectionUtils.isEmpty(orderMemberReceivedStatisticsList)?Collections.emptyList():orderMemberReceivedStatisticsList.stream()
-                .sorted(Comparator.comparing(OrderReceivedStatisticsBase::getDate)).collect(Collectors.toList());
+        return mapper.selectOrderMemberReceivedStatisticsGroupByDate(orderReceivedStatisticsFindDTO);
     }
 
     public List<OrderMemberReceivedStatistics> selectOrderReceivedStatisticsGroupByMonth(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO) {
-        List<OrderMemberReceivedStatistics> orderMemberReceivedStatisticsList = mapper.selectOrderMemberReceivedStatisticsGroupByMonth(orderReceivedStatisticsFindDTO);
-        return CollectionUtils.isEmpty(orderMemberReceivedStatisticsList)?Collections.emptyList():orderMemberReceivedStatisticsList.stream()
-                .sorted(Comparator.comparing(OrderReceivedStatisticsBase::getMonth)).collect(Collectors.toList());
+        return mapper.selectOrderMemberReceivedStatisticsGroupByMonth(orderReceivedStatisticsFindDTO);
     }
 
     public List<OrderMemberReceivedStatistics> selectOrderReceivedStatisticsGroupByWeekOfYear(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO) {
-        List<OrderMemberReceivedStatistics> orderMemberReceivedStatisticsList = mapper.selectOrderMemberReceivedStatisticsGroupByWeekOfYear(orderReceivedStatisticsFindDTO);
-        return CollectionUtils.isEmpty(orderMemberReceivedStatisticsList)?Collections.emptyList():orderMemberReceivedStatisticsList.stream()
-                .sorted(Comparator.comparing(OrderReceivedStatisticsBase::getWeekOfYear)).collect(Collectors.toList());
+        return mapper.selectOrderMemberReceivedStatisticsGroupByWeekOfYear(orderReceivedStatisticsFindDTO);
     }
 
     /**

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

@@ -468,16 +468,13 @@ public class OrderReceivedStatisticsBiz extends BaseBiz<OrderReceivedStatisticsM
     }
 
     private List<OrderReceivedStatistics> selectOrderReceivedStatisticsByDate(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO) {
-        List<OrderReceivedStatistics> orderReceivedStatisticsList = mapper.selectOrderReceivedStatisticsDateList(orderReceivedStatisticsFindDTO);
-        return CollectionUtils.isEmpty(orderReceivedStatisticsList)?Collections.emptyList():orderReceivedStatisticsList.stream().sorted(Comparator.comparing(OrderReceivedStatisticsBase::getDate)).collect(Collectors.toList());
+        return mapper.selectOrderReceivedStatisticsDateList(orderReceivedStatisticsFindDTO);
     }
     private List<OrderReceivedStatistics> selectOrderReceivedStatisticsByMonth(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO) {
-        List<OrderReceivedStatistics> orderReceivedStatisticsList = mapper.selectOrderReceivedStatisticsMonthList(orderReceivedStatisticsFindDTO);
-        return CollectionUtils.isEmpty(orderReceivedStatisticsList)?Collections.emptyList():orderReceivedStatisticsList.stream().sorted(Comparator.comparing(OrderReceivedStatisticsBase::getMonth)).collect(Collectors.toList());
+        return mapper.selectOrderReceivedStatisticsMonthList(orderReceivedStatisticsFindDTO);
     }
     private List<OrderReceivedStatistics> selectOrderReceivedStatisticsByWeekOfYear(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO) {
-        List<OrderReceivedStatistics> orderReceivedStatisticsList = mapper.selectOrderReceivedStatisticsWeekOfYearList(orderReceivedStatisticsFindDTO);
-        return CollectionUtils.isEmpty(orderReceivedStatisticsList)?Collections.emptyList():orderReceivedStatisticsList.stream().sorted(Comparator.comparing(OrderReceivedStatisticsBase::getWeekOfYear)).collect(Collectors.toList());
+        return mapper.selectOrderReceivedStatisticsWeekOfYearList(orderReceivedStatisticsFindDTO);
     }
 
     public int selectCountByCondition(CompanyPerformanceFindDTO companyPerformanceFindDTO) {

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

@@ -5,14 +5,12 @@ import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.google.common.collect.Lists;
 import com.xxfc.platform.order.bo.FeeTypeBo;
 import com.xxfc.platform.order.contant.enumerate.StatisticsStatusEnum;
-import com.xxfc.platform.order.entity.OrderReceivedStatisticsBase;
 import com.xxfc.platform.order.entity.OrderRentVehicleReceivedStatistics;
 import com.xxfc.platform.order.mapper.OrderRentVehicleReceivedStatisticsMapper;
 import com.xxfc.platform.order.pojo.account.OrderAccountBo;
 import com.xxfc.platform.order.pojo.dto.OrderDTO;
 import com.xxfc.platform.order.pojo.dto.OrderReceivedStatisticsFindDTO;
 import lombok.RequiredArgsConstructor;
-import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -21,7 +19,6 @@ import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.function.Supplier;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 /**
@@ -45,21 +42,15 @@ public class OrderRentVehicleReceivedStatisticsBiz extends BaseBiz<OrderRentVehi
      * @return
      */
     public List<OrderRentVehicleReceivedStatistics> selectOrderReceivedStatisticsGroupByDate(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO) {
-        List<OrderRentVehicleReceivedStatistics> orderRentVehicleReceivedStatisticsList = mapper.selectOrderRentVehicleReceivedStatisticsGroupByDate(orderReceivedStatisticsFindDTO);
-        return CollectionUtils.isEmpty(orderRentVehicleReceivedStatisticsList)?Collections.emptyList():orderRentVehicleReceivedStatisticsList.stream()
-                .sorted(Comparator.comparing(OrderReceivedStatisticsBase::getDate)).collect(Collectors.toList());
+       return mapper.selectOrderRentVehicleReceivedStatisticsGroupByDate(orderReceivedStatisticsFindDTO);
     }
 
     public List<OrderRentVehicleReceivedStatistics> selectOrderReceivedStatisticsGroupByMonth(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO) {
-        List<OrderRentVehicleReceivedStatistics> orderRentVehicleReceivedStatisticsList = mapper.selectOrderRentVehicleReceivedStatisticsGroupByMonth(orderReceivedStatisticsFindDTO);
-        return CollectionUtils.isEmpty(orderRentVehicleReceivedStatisticsList)?Collections.emptyList():orderRentVehicleReceivedStatisticsList.stream()
-                .sorted(Comparator.comparing(OrderReceivedStatisticsBase::getMonth)).collect(Collectors.toList());
+        return mapper.selectOrderRentVehicleReceivedStatisticsGroupByMonth(orderReceivedStatisticsFindDTO);
     }
 
     public List<OrderRentVehicleReceivedStatistics> selectOrderReceivedStatisticsGroupByWeekOfYear(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO) {
-        List<OrderRentVehicleReceivedStatistics> orderRentVehicleReceivedStatisticsList = mapper.selectOrderRentVehicleReceivedStatisticsGroupByWeekOfYear(orderReceivedStatisticsFindDTO);
-        return CollectionUtils.isEmpty(orderRentVehicleReceivedStatisticsList)?Collections.emptyList():orderRentVehicleReceivedStatisticsList.stream()
-                .sorted(Comparator.comparing(OrderReceivedStatisticsBase::getWeekOfYear)).collect(Collectors.toList());
+        return mapper.selectOrderRentVehicleReceivedStatisticsGroupByWeekOfYear(orderReceivedStatisticsFindDTO);
     }
 
     /**

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

@@ -5,7 +5,6 @@ import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.google.common.collect.Lists;
 import com.xxfc.platform.order.bo.FeeTypeBo;
 import com.xxfc.platform.order.contant.enumerate.StatisticsStatusEnum;
-import com.xxfc.platform.order.entity.OrderReceivedStatisticsBase;
 import com.xxfc.platform.order.entity.OrderTourReceivedStatistics;
 import com.xxfc.platform.order.mapper.OrderTourReceivedStatisticsMapper;
 import com.xxfc.platform.order.pojo.account.OrderAccountBo;
@@ -13,15 +12,12 @@ import com.xxfc.platform.order.pojo.dto.OrderDTO;
 import com.xxfc.platform.order.pojo.dto.OrderReceivedStatisticsFindDTO;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.util.*;
-import java.util.stream.Collectors;
-
 /**
  * @author libin
  * @version 1.0 旅游统计
@@ -36,19 +32,13 @@ public class OrderTourReceivedStatisticsBiz extends BaseBiz<OrderTourReceivedSta
     private final OrderAccountBiz orderAccountBiz;
 
     public List<OrderTourReceivedStatistics> selectOrderReceivedStatisticsGroupByDate(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO) {
-        List<OrderTourReceivedStatistics> orderTourReceivedStatisticsList = mapper.selectOrderTourReceivedStatisticsGroupByDate(orderReceivedStatisticsFindDTO);
-        return CollectionUtils.isEmpty(orderTourReceivedStatisticsList)?Collections.emptyList():orderTourReceivedStatisticsList.stream()
-                .sorted(Comparator.comparing(OrderReceivedStatisticsBase::getDate)).collect(Collectors.toList());
+          mapper.selectOrderTourReceivedStatisticsGroupByDate(orderReceivedStatisticsFindDTO);
     }
     public List<OrderTourReceivedStatistics> selectOrderReceivedStatisticsGroupByMonth(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO) {
-        List<OrderTourReceivedStatistics> orderTourReceivedStatisticsList = mapper.selectOrderTourReceivedStatisticsGroupByMonth(orderReceivedStatisticsFindDTO);
-        return CollectionUtils.isEmpty(orderTourReceivedStatisticsList)?Collections.emptyList():orderTourReceivedStatisticsList.stream()
-                .sorted(Comparator.comparing(OrderReceivedStatisticsBase::getMonth)).collect(Collectors.toList());
+        return mapper.selectOrderTourReceivedStatisticsGroupByMonth(orderReceivedStatisticsFindDTO);
     }
     public List<OrderTourReceivedStatistics> selectOrderReceivedStatisticsGroupByWeekOfYear(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO) {
-        List<OrderTourReceivedStatistics> orderTourReceivedStatisticsList = mapper.selectOrderTourReceivedStatisticsGroupByWeekOfYear(orderReceivedStatisticsFindDTO);
-        return CollectionUtils.isEmpty(orderTourReceivedStatisticsList)?Collections.emptyList():orderTourReceivedStatisticsList.stream()
-                .sorted(Comparator.comparing(OrderReceivedStatisticsBase::getWeekOfYear)).collect(Collectors.toList());
+        return mapper.selectOrderTourReceivedStatisticsGroupByWeekOfYear(orderReceivedStatisticsFindDTO);
     }
 
     /**