Merge remote-tracking branch 'origin/order_received_statistics' into order_received_statistics

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

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.persistence.*;
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -14,7 +15,8 @@ import java.util.Date;
  * @data 2019/11/11 15:49
  */
 @Data
-public class OrderReceivedStatisticsBase  {
+public class OrderReceivedStatisticsBase implements Serializable {
+    private static final long serialVersionUID = 1L;
     /**
      *
      */

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

@@ -4,7 +4,6 @@ import cn.hutool.core.util.ObjectUtil;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.util.CollectorsUtil;
 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;
@@ -14,14 +13,12 @@ import com.xxfc.platform.order.pojo.dto.OrderReceivedStatisticsFindDTO;
 import com.xxfc.platform.order.pojo.order.CompanyAmountBo;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import lombok.RequiredArgsConstructor;
-import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.util.*;
-import java.util.function.BinaryOperator;
 import java.util.stream.Collectors;
 
 /**
@@ -114,6 +111,7 @@ public class OrderRentVehicleReceivedStatisticsBiz extends BaseBiz<OrderRentVehi
             }
         }
 
+        //无状态组合统计对象生成
         Map<Integer, BigDecimal> companyAmountMap = companyAmoutList.stream().collect(Collectors.groupingBy(CompanyAmountBo::getCompanyId,
                 CollectorsUtil.summingBigDecimal(CompanyAmountBo::getAmount)));
         Set<Map.Entry<Integer, BigDecimal>> companyAmountSet = companyAmountMap.entrySet();