Merge branch 'order_received_statistics' into dev

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

@@ -7,6 +7,7 @@ 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;
@@ -45,15 +46,21 @@ public class OrderMemberReceivedStatisticsBiz extends BaseBiz<OrderMemberReceive
      * @return
      */
     public List<OrderMemberReceivedStatistics> selectOrderReceivedStatisticsGroupByDate(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO) {
-        return mapper.selectOrderMemberReceivedStatisticsGroupByDate(orderReceivedStatisticsFindDTO);
+        List<OrderMemberReceivedStatistics> orderMemberReceivedStatisticsList = mapper.selectOrderMemberReceivedStatisticsGroupByDate(orderReceivedStatisticsFindDTO);
+        return CollectionUtils.isEmpty(orderMemberReceivedStatisticsList)?Collections.emptyList():orderMemberReceivedStatisticsList.stream()
+                .sorted(Comparator.comparing(OrderReceivedStatisticsBase::getDate)).collect(Collectors.toList());
     }
 
     public List<OrderMemberReceivedStatistics> selectOrderReceivedStatisticsGroupByMonth(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO) {
-        return mapper.selectOrderMemberReceivedStatisticsGroupByMonth(orderReceivedStatisticsFindDTO);
+        List<OrderMemberReceivedStatistics> orderMemberReceivedStatisticsList = mapper.selectOrderMemberReceivedStatisticsGroupByMonth(orderReceivedStatisticsFindDTO);
+        return CollectionUtils.isEmpty(orderMemberReceivedStatisticsList)?Collections.emptyList():orderMemberReceivedStatisticsList.stream()
+                .sorted(Comparator.comparing(OrderReceivedStatisticsBase::getMonth)).collect(Collectors.toList());
     }
 
     public List<OrderMemberReceivedStatistics> selectOrderReceivedStatisticsGroupByWeekOfYear(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO) {
-        return mapper.selectOrderMemberReceivedStatisticsGroupByWeekOfYear(orderReceivedStatisticsFindDTO);
+        List<OrderMemberReceivedStatistics> orderMemberReceivedStatisticsList = mapper.selectOrderMemberReceivedStatisticsGroupByWeekOfYear(orderReceivedStatisticsFindDTO);
+        return CollectionUtils.isEmpty(orderMemberReceivedStatisticsList)?Collections.emptyList():orderMemberReceivedStatisticsList.stream()
+                .sorted(Comparator.comparing(OrderReceivedStatisticsBase::getWeekOfYear)).collect(Collectors.toList());
     }
 
     /**

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

@@ -31,7 +31,6 @@ import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ThreadPoolExecutor;
 import java.util.stream.Collectors;
 
 /**
@@ -469,13 +468,16 @@ public class OrderReceivedStatisticsBiz extends BaseBiz<OrderReceivedStatisticsM
     }
 
     private List<OrderReceivedStatistics> selectOrderReceivedStatisticsByDate(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO) {
-        return mapper.selectOrderReceivedStatisticsDateList(orderReceivedStatisticsFindDTO);
+        List<OrderReceivedStatistics> orderReceivedStatisticsList = mapper.selectOrderReceivedStatisticsDateList(orderReceivedStatisticsFindDTO);
+        return CollectionUtils.isEmpty(orderReceivedStatisticsList)?Collections.emptyList():orderReceivedStatisticsList.stream().sorted(Comparator.comparing(OrderReceivedStatisticsBase::getDate)).collect(Collectors.toList());
     }
     private List<OrderReceivedStatistics> selectOrderReceivedStatisticsByMonth(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO) {
-        return mapper.selectOrderReceivedStatisticsMonthList(orderReceivedStatisticsFindDTO);
+        List<OrderReceivedStatistics> orderReceivedStatisticsList = mapper.selectOrderReceivedStatisticsMonthList(orderReceivedStatisticsFindDTO);
+        return CollectionUtils.isEmpty(orderReceivedStatisticsList)?Collections.emptyList():orderReceivedStatisticsList.stream().sorted(Comparator.comparing(OrderReceivedStatisticsBase::getMonth)).collect(Collectors.toList());
     }
     private List<OrderReceivedStatistics> selectOrderReceivedStatisticsByWeekOfYear(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO) {
-        return mapper.selectOrderReceivedStatisticsWeekOfYearList(orderReceivedStatisticsFindDTO);
+        List<OrderReceivedStatistics> orderReceivedStatisticsList = mapper.selectOrderReceivedStatisticsWeekOfYearList(orderReceivedStatisticsFindDTO);
+        return CollectionUtils.isEmpty(orderReceivedStatisticsList)?Collections.emptyList():orderReceivedStatisticsList.stream().sorted(Comparator.comparing(OrderReceivedStatisticsBase::getWeekOfYear)).collect(Collectors.toList());
     }
 
     public int selectCountByCondition(CompanyPerformanceFindDTO companyPerformanceFindDTO) {

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

@@ -5,12 +5,14 @@ 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;
@@ -19,6 +21,7 @@ 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;
 
 /**
@@ -42,15 +45,21 @@ public class OrderRentVehicleReceivedStatisticsBiz extends BaseBiz<OrderRentVehi
      * @return
      */
     public List<OrderRentVehicleReceivedStatistics> selectOrderReceivedStatisticsGroupByDate(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO) {
-        return mapper.selectOrderRentVehicleReceivedStatisticsGroupByDate(orderReceivedStatisticsFindDTO);
+        List<OrderRentVehicleReceivedStatistics> orderRentVehicleReceivedStatisticsList = mapper.selectOrderRentVehicleReceivedStatisticsGroupByDate(orderReceivedStatisticsFindDTO);
+        return CollectionUtils.isEmpty(orderRentVehicleReceivedStatisticsList)?Collections.emptyList():orderRentVehicleReceivedStatisticsList.stream()
+                .sorted(Comparator.comparing(OrderReceivedStatisticsBase::getDate)).collect(Collectors.toList());
     }
 
     public List<OrderRentVehicleReceivedStatistics> selectOrderReceivedStatisticsGroupByMonth(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO) {
-        return mapper.selectOrderRentVehicleReceivedStatisticsGroupByMonth(orderReceivedStatisticsFindDTO);
+        List<OrderRentVehicleReceivedStatistics> orderRentVehicleReceivedStatisticsList = mapper.selectOrderRentVehicleReceivedStatisticsGroupByMonth(orderReceivedStatisticsFindDTO);
+        return CollectionUtils.isEmpty(orderRentVehicleReceivedStatisticsList)?Collections.emptyList():orderRentVehicleReceivedStatisticsList.stream()
+                .sorted(Comparator.comparing(OrderReceivedStatisticsBase::getMonth)).collect(Collectors.toList());
     }
 
     public List<OrderRentVehicleReceivedStatistics> selectOrderReceivedStatisticsGroupByWeekOfYear(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO) {
-        return mapper.selectOrderRentVehicleReceivedStatisticsGroupByWeekOfYear(orderReceivedStatisticsFindDTO);
+        List<OrderRentVehicleReceivedStatistics> orderRentVehicleReceivedStatisticsList = mapper.selectOrderRentVehicleReceivedStatisticsGroupByWeekOfYear(orderReceivedStatisticsFindDTO);
+        return CollectionUtils.isEmpty(orderRentVehicleReceivedStatisticsList)?Collections.emptyList():orderRentVehicleReceivedStatisticsList.stream()
+                .sorted(Comparator.comparing(OrderReceivedStatisticsBase::getWeekOfYear)).collect(Collectors.toList());
     }
 
     /**

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

@@ -5,6 +5,7 @@ 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;
@@ -12,12 +13,15 @@ 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 旅游统计
@@ -32,13 +36,19 @@ public class OrderTourReceivedStatisticsBiz extends BaseBiz<OrderTourReceivedSta
     private final OrderAccountBiz orderAccountBiz;
 
     public List<OrderTourReceivedStatistics> selectOrderReceivedStatisticsGroupByDate(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO) {
-        return mapper.selectOrderTourReceivedStatisticsGroupByDate(orderReceivedStatisticsFindDTO);
+        List<OrderTourReceivedStatistics> orderTourReceivedStatisticsList = mapper.selectOrderTourReceivedStatisticsGroupByDate(orderReceivedStatisticsFindDTO);
+        return CollectionUtils.isEmpty(orderTourReceivedStatisticsList)?Collections.emptyList():orderTourReceivedStatisticsList.stream()
+                .sorted(Comparator.comparing(OrderReceivedStatisticsBase::getDate)).collect(Collectors.toList());
     }
     public List<OrderTourReceivedStatistics> selectOrderReceivedStatisticsGroupByMonth(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO) {
-        return mapper.selectOrderTourReceivedStatisticsGroupByMonth(orderReceivedStatisticsFindDTO);
+        List<OrderTourReceivedStatistics> orderTourReceivedStatisticsList = mapper.selectOrderTourReceivedStatisticsGroupByMonth(orderReceivedStatisticsFindDTO);
+        return CollectionUtils.isEmpty(orderTourReceivedStatisticsList)?Collections.emptyList():orderTourReceivedStatisticsList.stream()
+                .sorted(Comparator.comparing(OrderReceivedStatisticsBase::getMonth)).collect(Collectors.toList());
     }
     public List<OrderTourReceivedStatistics> selectOrderReceivedStatisticsGroupByWeekOfYear(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO) {
-        return mapper.selectOrderTourReceivedStatisticsGroupByWeekOfYear(orderReceivedStatisticsFindDTO);
+        List<OrderTourReceivedStatistics> orderTourReceivedStatisticsList = mapper.selectOrderTourReceivedStatisticsGroupByWeekOfYear(orderReceivedStatisticsFindDTO);
+        return CollectionUtils.isEmpty(orderTourReceivedStatisticsList)?Collections.emptyList():orderTourReceivedStatisticsList.stream()
+                .sorted(Comparator.comparing(OrderReceivedStatisticsBase::getWeekOfYear)).collect(Collectors.toList());
     }
 
     /**

xx-order/xx-order-server/src/test/java/ServiceTest.java

-import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateUtil;
 import com.xxfc.platform.order.OrderApplication;
 import com.xxfc.platform.order.biz.*;
@@ -129,8 +128,8 @@ public class ServiceTest {
         cn.hutool.core.date.DateTime dateTime = DateUtil.parse("2019-11-29", "yyyy-MM-dd");
      //   cn.hutool.core.date.DateTime offset = DateUtil.offset(dateTime, DateField.DAY_OF_MONTH, 1);
      /*   orderReceivedStatisticsJobHandler.execute("2019-11-29");*/
-        LocalDate startLocalDate = LocalDate.of(2019, 10, 1);
-        LocalDate endLocalDate = LocalDate.of(2019,11,30);
+        LocalDate startLocalDate = LocalDate.of(2019, 11, 30);
+        LocalDate endLocalDate = LocalDate.of(2019,12,19);
         while (startLocalDate.isBefore(endLocalDate)){
             String dateStr = startLocalDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
             startLocalDate = startLocalDate.plusDays(1);