Merge branch 'order_received_statistics'

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserDetailBiz.java

@@ -12,6 +12,7 @@ import com.github.wxiaoqi.security.admin.vo.AppUserInfoVo;
 import com.github.wxiaoqi.security.admin.vo.AppUserVo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.xxfc.platform.im.utils.BeanUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.collections.CollectionUtils;
@@ -192,4 +193,13 @@ public class AppUserDetailBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
         List<UserStaffBo> staffBos = mapper.findAllStaffsByCompanyIdAndPostionId(staffStatisticsFindDTO);
         return CollectionUtils.isEmpty(staffBos)?Collections.EMPTY_LIST:staffBos;
     }
+
+    public AppUserVo findByCode(String code) {
+        AppUserVo appUserVo = new AppUserVo();
+        AppUserDetail appUserDetail = new AppUserDetail();
+        appUserDetail.setCode(code);
+        appUserDetail = mapper.selectOne(appUserDetail);
+        org.springframework.beans.BeanUtils.copyProperties(appUserDetail,appUserVo);
+        return appUserVo;
+    }
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUserController.java

@@ -372,4 +372,10 @@ public class AppUserController extends CommonBaseController{
     public List<UserStaffBo> findAllStaffs(){
        return userDetailBiz.findAllStaffs();
     }
+
+    @GetMapping("/app/unauth/code/{code}")
+    public ObjectRestResponse<AppUserVo> findAppuserInfoByCode(@PathVariable("code") String code){
+       AppUserVo appUserVo =  userDetailBiz.findByCode(code);
+       return ObjectRestResponse.succ(appUserVo);
+    }
 }

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

@@ -137,7 +137,6 @@ public enum StatisticsStatusEnum {
                     feeTypeBo.setNoDeductibleAmount(feeTypeBo.getNoDeductibleAmount().add(dameSafeAmount));
                 }
                 //订单金额(不包含免赔和押金)
-
                 feeTypeBo.setTotalAmount(feeTypeBo.getTotalAmount().add(accountDetailEntity.getOrderAmount()).subtract(feeTypeBo.getNoDeductibleAmount()));
             } else {
                 //退款订单押金
@@ -154,7 +153,6 @@ public enum StatisticsStatusEnum {
                         feeTypeBo.setNoDeductibleRefundAmount(feeTypeBo.getNoDeductibleRefundAmount().add(dameSafeAmount));
                     }
                 }
-
                 //遍历消费明细
                 for (OrderAccountDeduction deduction : deductions) {
                     BigDecimal deductionAmount = deduction.getAmount();
@@ -189,6 +187,12 @@ public enum StatisticsStatusEnum {
                 feeTypeBo.setOrderRefundAmount(feeTypeBo.getOrderRefundAmount().add(accountDetailEntity.getOrderAmount()).subtract(feeTypeBo.getNoDeductibleRefundAmount()));
             }
         }
+/*        //订单支付金额(不包含免赔，押金)减去退款的金额
+        feeTypeBo.setTotalAmount(feeTypeBo.getTotalAmount().subtract(feeTypeBo.getOrderRefundAmount()));
+        //订单押金减去退款押金
+        feeTypeBo.setDepositAmount(feeTypeBo.getDepositAmount().subtract(feeTypeBo.getDepositRefundAmount()));
+        //订单免赔金额减去退款的免赔金额
+        feeTypeBo.setNoDeductibleAmount(feeTypeBo.getNoDeductibleAmount().subtract(feeTypeBo.getDepositRefundAmount()));*/
         return feeTypeBo;
     }
 

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

@@ -44,8 +44,16 @@ public class OrderMemberReceivedStatisticsBiz extends BaseBiz<OrderMemberReceive
      * @param orderReceivedStatisticsFindDTO
      * @return
      */
-    public List<OrderMemberReceivedStatistics> selectOrderReceivedStatistics(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO) {
-        return mapper.selectOrderMemberReceivedStatistics(orderReceivedStatisticsFindDTO);
+    public List<OrderMemberReceivedStatistics> selectOrderReceivedStatisticsGroupByDate(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO) {
+        return mapper.selectOrderMemberReceivedStatisticsGroupByDate(orderReceivedStatisticsFindDTO);
+    }
+
+    public List<OrderMemberReceivedStatistics> selectOrderReceivedStatisticsGroupByMonth(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO) {
+        return mapper.selectOrderMemberReceivedStatisticsGroupByMonth(orderReceivedStatisticsFindDTO);
+    }
+
+    public List<OrderMemberReceivedStatistics> selectOrderReceivedStatisticsGroupByWeekOfYear(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO) {
+        return mapper.selectOrderMemberReceivedStatisticsGroupByWeekOfYear(orderReceivedStatisticsFindDTO);
     }
 
     /**

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

@@ -14,11 +14,13 @@ import com.xxfc.platform.order.pojo.dto.CompanyPerformanceFindDTO;
 import com.xxfc.platform.order.pojo.dto.OrderReceivedStatisticsFindDTO;
 import com.xxfc.platform.order.pojo.vo.OrderReceivedStatisticsVo;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -28,6 +30,8 @@ import java.math.BigDecimal;
 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;
 
 /**
@@ -37,6 +41,7 @@ import java.util.stream.Collectors;
  * @email 18178966185@163.com
  * @date 2019-11-08 18:03:42
  */
+@Slf4j
 @Service
 @Transactional(rollbackFor = Exception.class)
 @RequiredArgsConstructor(onConstructor = @__(@Autowired))
@@ -51,6 +56,7 @@ public class OrderReceivedStatisticsBiz extends BaseBiz<OrderReceivedStatisticsM
     private List<String> orderTourSigns;
     private Map<String, String> signAndDescMap;
     private DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+    private final ThreadPoolTaskExecutor executor;
 
 
     /**
@@ -223,23 +229,40 @@ public class OrderReceivedStatisticsBiz extends BaseBiz<OrderReceivedStatisticsM
     public Map<String, List<OrderReceivedStatisticsVo>> getOrderReceivedStatisticsResult(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO) {
         Map<String, List<OrderReceivedStatisticsVo>> resultMap = new HashMap<>();
         List<String> statisticalSigns = orderReceivedStatisticsFindDTO.getStatisticalSigns();
-
+        CountDownLatch latch = new CountDownLatch(4);
+        try {
+        executor.execute(()->{
             //订单统计
             Map<String, List<OrderReceivedStatisticsVo>> orderReceivedStatisticsMap = orderReceivedStatistics(orderReceivedStatisticsFindDTO, statisticalSigns);
+            resultMap.putAll(orderReceivedStatisticsMap);
+            latch.countDown();
+        });
 
+        executor.execute(()->{
             //租车订单统计
             Map<String, List<OrderReceivedStatisticsVo>> orderRentVehicleReceivedStatisticsMap = orderRentVehicleRceicedStatistics(orderReceivedStatisticsFindDTO, statisticalSigns);
+            resultMap.putAll(orderRentVehicleReceivedStatisticsMap);
+            latch.countDown();
+        });
 
+        executor.execute(()->{
             //旅游订单统计
             Map<String, List<OrderReceivedStatisticsVo>> orderTourReceivedStatisticsMap = orderTourReceivedStatistcs(orderReceivedStatisticsFindDTO, statisticalSigns);
+            resultMap.putAll(orderTourReceivedStatisticsMap);
+            latch.countDown();
+        });
 
+        executor.execute(()->{
             //会员订单统计
             Map<String, List<OrderReceivedStatisticsVo>> orderMemberReceivedStatisticsMap = orderMemberReceivedStatistics(orderReceivedStatisticsFindDTO, statisticalSigns);
-
-        resultMap.putAll(orderReceivedStatisticsMap);
-        resultMap.putAll(orderRentVehicleReceivedStatisticsMap);
-        resultMap.putAll(orderTourReceivedStatisticsMap);
             resultMap.putAll(orderMemberReceivedStatisticsMap);
+            latch.countDown();
+        });
+
+            latch.await();
+        } catch (Exception e) {
+            log.error("订单概况统计失败【{}】",e);
+        }
         return resultMap;
     }
 
@@ -263,6 +286,7 @@ public class OrderReceivedStatisticsBiz extends BaseBiz<OrderReceivedStatisticsM
         OrderReceivedStatistics orderReceivedStatistics = new OrderReceivedStatistics();
         Set<Map.Entry<String, List<OrderRentVehicleReceivedStatistics>>> rentVehicleSet = rentVehicleMap.entrySet();
         for (Map.Entry<String, List<OrderRentVehicleReceivedStatistics>> rentVehicleEntry : rentVehicleSet) {
+            try {
                 String stateGroup = rentVehicleEntry.getKey();
                 List<OrderRentVehicleReceivedStatistics> rentVehicleEntryValue = rentVehicleEntry.getValue();
                 //创建默认的订单统计对象并设置默认值
@@ -322,7 +346,9 @@ public class OrderReceivedStatisticsBiz extends BaseBiz<OrderReceivedStatisticsM
                 orderReceivedStatisticsClone.setOrderRefundAmount(totalRefundAmount);
                 orderReceivedStatisticsClone.setTotalQuantity(totalQuantity);
                 orderReceivedStatisticsList.add(orderReceivedStatisticsClone);
-
+            }catch (Exception ex){
+                log.error("当前状态组合【{}】===日期【{}】",rentVehicleEntry.getKey(),rentVehicleEntry.getValue().get(0).getDate());
+            }
         }
         //保存
         StatisticsStatusEnum.insertReceivedStatisticsBatch(orderReceivedStatisticsList, mapper);
@@ -337,7 +363,16 @@ public class OrderReceivedStatisticsBiz extends BaseBiz<OrderReceivedStatisticsM
      */
     private Map<String, List<OrderReceivedStatisticsVo>> orderReceivedStatistics(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO, List<String> statisticalSigns) {
         if (CollectionUtil.containsAny(statisticalSigns, orderSigns)) {
-            List<OrderReceivedStatistics> orderReceivedStatisticsList = selectOrderReceivedStatistics(orderReceivedStatisticsFindDTO);
+            List<OrderReceivedStatistics> orderReceivedStatisticsList = new ArrayList<>();
+             if (orderReceivedStatisticsFindDTO.getStatisticalWay()==ReceivedStatisticsEnum.DAY.getWayCode()){
+                 orderReceivedStatisticsList = selectOrderReceivedStatisticsByDate(orderReceivedStatisticsFindDTO);
+             }
+            if (orderReceivedStatisticsFindDTO.getStatisticalWay()==ReceivedStatisticsEnum.MONTH.getWayCode()){
+                orderReceivedStatisticsList = selectOrderReceivedStatisticsByMonth(orderReceivedStatisticsFindDTO);
+            }
+            if (orderReceivedStatisticsFindDTO.getStatisticalWay()==ReceivedStatisticsEnum.WEEK.getWayCode()){
+                orderReceivedStatisticsList = selectOrderReceivedStatisticsByWeekOfYear(orderReceivedStatisticsFindDTO);
+            }
             //日 周 月  的统计
             Map<Object, List<OrderReceivedStatisticsBase>> orderstatisticsMap = ReceivedStatisticsEnum.orderstatistics(orderReceivedStatisticsList, orderReceivedStatisticsFindDTO.getStatisticalWay());
             //统计项
@@ -356,7 +391,16 @@ public class OrderReceivedStatisticsBiz extends BaseBiz<OrderReceivedStatisticsM
      */
     private Map<String, List<OrderReceivedStatisticsVo>> orderRentVehicleRceicedStatistics(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO, List<String> statisticalSigns) {
         if (CollectionUtil.containsAny(statisticalSigns, orderRentVehicleSigns)) {
-            List<OrderRentVehicleReceivedStatistics> orderRentVehicleReceivedStatisticsList = orderRentVehicleReceivedStatisticsBiz.selectOrderReceivedStatistics(orderReceivedStatisticsFindDTO);
+            List<OrderRentVehicleReceivedStatistics> orderRentVehicleReceivedStatisticsList = new ArrayList<>();
+            if (orderReceivedStatisticsFindDTO.getStatisticalWay()==ReceivedStatisticsEnum.DAY.getWayCode()){
+                orderRentVehicleReceivedStatisticsList =  orderRentVehicleReceivedStatisticsBiz.selectOrderReceivedStatisticsGroupByDate(orderReceivedStatisticsFindDTO);
+            }
+            if (orderReceivedStatisticsFindDTO.getStatisticalWay()==ReceivedStatisticsEnum.MONTH.getWayCode()){
+                orderRentVehicleReceivedStatisticsList =  orderRentVehicleReceivedStatisticsBiz.selectOrderReceivedStatisticsGroupByMonth(orderReceivedStatisticsFindDTO);
+            }
+            if (orderReceivedStatisticsFindDTO.getStatisticalWay()==ReceivedStatisticsEnum.WEEK.getWayCode()){
+                orderRentVehicleReceivedStatisticsList =  orderRentVehicleReceivedStatisticsBiz.selectOrderReceivedStatisticsGroupByWeekOfYear(orderReceivedStatisticsFindDTO);
+            }
             //日 周 月  的统计
             Map<Object, List<OrderReceivedStatisticsBase>> orderRentVehiclestatisticsMap = ReceivedStatisticsEnum.orderstatistics(orderRentVehicleReceivedStatisticsList, orderReceivedStatisticsFindDTO.getStatisticalWay());
             //统计项
@@ -375,7 +419,17 @@ public class OrderReceivedStatisticsBiz extends BaseBiz<OrderReceivedStatisticsM
      */
     private Map<String, List<OrderReceivedStatisticsVo>> orderTourReceivedStatistcs(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO, List<String> statisticalSigns) {
         if (CollectionUtil.containsAny(statisticalSigns, orderTourSigns)) {
-            List<OrderTourReceivedStatistics> orderTourReceivedStatisticsList = orderTourReceivedStatisticsBiz.selectOrderReceivedStatistics(orderReceivedStatisticsFindDTO);
+
+            List<OrderTourReceivedStatistics> orderTourReceivedStatisticsList = new ArrayList<>();
+            if (orderReceivedStatisticsFindDTO.getStatisticalWay()==ReceivedStatisticsEnum.DAY.getWayCode()){
+                orderTourReceivedStatisticsList =  orderTourReceivedStatisticsBiz.selectOrderReceivedStatisticsGroupByDate(orderReceivedStatisticsFindDTO);
+            }
+            if (orderReceivedStatisticsFindDTO.getStatisticalWay()==ReceivedStatisticsEnum.MONTH.getWayCode()){
+                orderTourReceivedStatisticsList =  orderTourReceivedStatisticsBiz.selectOrderReceivedStatisticsGroupByMonth(orderReceivedStatisticsFindDTO);
+            }
+            if (orderReceivedStatisticsFindDTO.getStatisticalWay()==ReceivedStatisticsEnum.WEEK.getWayCode()){
+                orderTourReceivedStatisticsList = orderTourReceivedStatisticsBiz.selectOrderReceivedStatisticsGroupByWeekOfYear(orderReceivedStatisticsFindDTO);
+            }
             //日 周 月  的统计
             Map<Object, List<OrderReceivedStatisticsBase>> orderTourstatisticsMap = ReceivedStatisticsEnum.orderstatistics(orderTourReceivedStatisticsList, orderReceivedStatisticsFindDTO.getStatisticalWay());
             //统计项
@@ -394,7 +448,17 @@ public class OrderReceivedStatisticsBiz extends BaseBiz<OrderReceivedStatisticsM
      */
     private Map<String, List<OrderReceivedStatisticsVo>> orderMemberReceivedStatistics(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO, List<String> statisticalSigns) {
         if (CollectionUtil.containsAny(statisticalSigns, orderMemberSigns)) {
-            List<OrderMemberReceivedStatistics> orderMemberReceivedStatisticsList = orderMemberReceivedStatisticsBiz.selectOrderReceivedStatistics(orderReceivedStatisticsFindDTO);
+
+            List<OrderMemberReceivedStatistics> orderMemberReceivedStatisticsList = new ArrayList<>();
+            if (orderReceivedStatisticsFindDTO.getStatisticalWay()==ReceivedStatisticsEnum.DAY.getWayCode()){
+                orderMemberReceivedStatisticsList = orderMemberReceivedStatisticsBiz.selectOrderReceivedStatisticsGroupByDate(orderReceivedStatisticsFindDTO);
+            }
+            if (orderReceivedStatisticsFindDTO.getStatisticalWay()==ReceivedStatisticsEnum.MONTH.getWayCode()){
+                orderMemberReceivedStatisticsList = orderMemberReceivedStatisticsBiz.selectOrderReceivedStatisticsGroupByMonth(orderReceivedStatisticsFindDTO);
+            }
+            if (orderReceivedStatisticsFindDTO.getStatisticalWay()==ReceivedStatisticsEnum.WEEK.getWayCode()){
+                orderMemberReceivedStatisticsList = orderMemberReceivedStatisticsBiz.selectOrderReceivedStatisticsGroupByWeekOfYear(orderReceivedStatisticsFindDTO);
+            }
             //日 周 月  的统计
             Map<Object, List<OrderReceivedStatisticsBase>> orderMemberstatisticsMap = ReceivedStatisticsEnum.orderstatistics(orderMemberReceivedStatisticsList, orderReceivedStatisticsFindDTO.getStatisticalWay());
             //统计项
@@ -404,8 +468,14 @@ public class OrderReceivedStatisticsBiz extends BaseBiz<OrderReceivedStatisticsM
         return Collections.EMPTY_MAP;
     }
 
-    private List<OrderReceivedStatistics> selectOrderReceivedStatistics(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO) {
-        return mapper.selectOrderReceivedStatisticsList(orderReceivedStatisticsFindDTO);
+    private List<OrderReceivedStatistics> selectOrderReceivedStatisticsByDate(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO) {
+        return mapper.selectOrderReceivedStatisticsDateList(orderReceivedStatisticsFindDTO);
+    }
+    private List<OrderReceivedStatistics> selectOrderReceivedStatisticsByMonth(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO) {
+        return mapper.selectOrderReceivedStatisticsMonthList(orderReceivedStatisticsFindDTO);
+    }
+    private List<OrderReceivedStatistics> selectOrderReceivedStatisticsByWeekOfYear(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO) {
+        return mapper.selectOrderReceivedStatisticsWeekOfYearList(orderReceivedStatisticsFindDTO);
     }
 
     public int selectCountByCondition(CompanyPerformanceFindDTO companyPerformanceFindDTO) {

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

@@ -41,8 +41,16 @@ public class OrderRentVehicleReceivedStatisticsBiz extends BaseBiz<OrderRentVehi
      * @param orderReceivedStatisticsFindDTO
      * @return
      */
-    public List<OrderRentVehicleReceivedStatistics> selectOrderReceivedStatistics(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO) {
-        return mapper.selectOrderRentVehicleReceivedStatistics(orderReceivedStatisticsFindDTO);
+    public List<OrderRentVehicleReceivedStatistics> selectOrderReceivedStatisticsGroupByDate(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO) {
+        return mapper.selectOrderRentVehicleReceivedStatisticsGroupByDate(orderReceivedStatisticsFindDTO);
+    }
+
+    public List<OrderRentVehicleReceivedStatistics> selectOrderReceivedStatisticsGroupByMonth(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO) {
+        return mapper.selectOrderRentVehicleReceivedStatisticsGroupByMonth(orderReceivedStatisticsFindDTO);
+    }
+
+    public List<OrderRentVehicleReceivedStatistics> selectOrderReceivedStatisticsGroupByWeekOfYear(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO) {
+        return mapper.selectOrderRentVehicleReceivedStatisticsGroupByWeekOfYear(orderReceivedStatisticsFindDTO);
     }
 
     /**

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

@@ -31,8 +31,14 @@ public class OrderTourReceivedStatisticsBiz extends BaseBiz<OrderTourReceivedSta
     private final BaseOrderBiz baseOrderBiz;
     private final OrderAccountBiz orderAccountBiz;
 
-    public List<OrderTourReceivedStatistics> selectOrderReceivedStatistics(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO) {
-        return mapper.selectOrderTourReceivedStatistics(orderReceivedStatisticsFindDTO);
+    public List<OrderTourReceivedStatistics> selectOrderReceivedStatisticsGroupByDate(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO) {
+        return mapper.selectOrderTourReceivedStatisticsGroupByDate(orderReceivedStatisticsFindDTO);
+    }
+    public List<OrderTourReceivedStatistics> selectOrderReceivedStatisticsGroupByMonth(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO) {
+        return mapper.selectOrderTourReceivedStatisticsGroupByMonth(orderReceivedStatisticsFindDTO);
+    }
+    public List<OrderTourReceivedStatistics> selectOrderReceivedStatisticsGroupByWeekOfYear(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO) {
+        return mapper.selectOrderTourReceivedStatisticsGroupByWeekOfYear(orderReceivedStatisticsFindDTO);
     }
 
     /**

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/OrderMemberReceivedStatisticsMapper.java

@@ -17,7 +17,8 @@ import java.util.List;
  */
 public interface OrderMemberReceivedStatisticsMapper extends Mapper<OrderMemberReceivedStatistics>, InsertListMapper<OrderMemberReceivedStatistics> {
 
-    List<OrderMemberReceivedStatistics> selectOrderMemberReceivedStatistics(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO);
+    List<OrderMemberReceivedStatistics> selectOrderMemberReceivedStatisticsGroupByDate(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO);
+    List<OrderMemberReceivedStatistics> selectOrderMemberReceivedStatisticsGroupByMonth(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO);
+    List<OrderMemberReceivedStatistics> selectOrderMemberReceivedStatisticsGroupByWeekOfYear(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO);
 
-    void inserMemberReceivedtList(@Param("orderMembers") List<OrderMemberReceivedStatistics> orderMemberReceivedStatistics);
 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/OrderReceivedStatisticsMapper.java

@@ -18,7 +18,9 @@ import java.util.List;
  */
 public interface OrderReceivedStatisticsMapper extends Mapper<OrderReceivedStatistics>, InsertListMapper<OrderReceivedStatistics> {
 
-    List<OrderReceivedStatistics> selectOrderReceivedStatisticsList(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO);
+    List<OrderReceivedStatistics> selectOrderReceivedStatisticsDateList(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO);
+    List<OrderReceivedStatistics> selectOrderReceivedStatisticsMonthList(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO);
+    List<OrderReceivedStatistics> selectOrderReceivedStatisticsWeekOfYearList(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO);
 
     List<CompanyPerformanceBo> selectCompanyPerformanceWithDay(CompanyPerformanceFindDTO companyPerformanceFindDTO);
 

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/OrderRentVehicleReceivedStatisticsMapper.java

@@ -16,5 +16,7 @@ import java.util.List;
  */
 public interface OrderRentVehicleReceivedStatisticsMapper extends Mapper<OrderRentVehicleReceivedStatistics>, InsertListMapper<OrderRentVehicleReceivedStatistics> {
 
-    List<OrderRentVehicleReceivedStatistics> selectOrderRentVehicleReceivedStatistics(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO);
+    List<OrderRentVehicleReceivedStatistics> selectOrderRentVehicleReceivedStatisticsGroupByDate(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO);
+    List<OrderRentVehicleReceivedStatistics> selectOrderRentVehicleReceivedStatisticsGroupByMonth(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO);
+    List<OrderRentVehicleReceivedStatistics> selectOrderRentVehicleReceivedStatisticsGroupByWeekOfYear(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO);
 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/OrderTourReceivedStatisticsMapper.java

@@ -16,5 +16,7 @@ import java.util.List;
  */
 public interface OrderTourReceivedStatisticsMapper extends Mapper<OrderTourReceivedStatistics>, InsertListMapper<OrderTourReceivedStatistics> {
 
-    List<OrderTourReceivedStatistics> selectOrderTourReceivedStatistics(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO);
+    List<OrderTourReceivedStatistics> selectOrderTourReceivedStatisticsGroupByDate(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO);
+    List<OrderTourReceivedStatistics> selectOrderTourReceivedStatisticsGroupByMonth(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO);
+    List<OrderTourReceivedStatistics> selectOrderTourReceivedStatisticsGroupByWeekOfYear(OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO);
 }

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

@@ -29,10 +29,12 @@
         <result property="crtTime" column="crt_time"/>
     </resultMap>
 
-    <select id="selectOrderMemberReceivedStatistics" resultMap="orderMemberReceivedStatisticsMap">
-        select  * from  `order_member_received_statistics` where 1=1
+    <select id="selectOrderMemberReceivedStatisticsGroupByDate" resultType="com.xxfc.platform.order.entity.OrderMemberReceivedStatistics">
+        select `date`,`year`,IFNULL(sum(`total_amount`),0) as `totalAmount`,IFNULL(sum(`total_quantity`),0) as `totalQuantity`,IFNULL(sum(`toal_common_ammount`),0) as `toalCommonAmmount`,
+         IFNULL(sum(`total_common_quantity`),0) as `totalCommonQuantity`,IFNULL(sum(`total_gold_amount`),0) as `totalGoldAmount`,IFNULL(sum(`total_gold_quantity`),0),
+         IFNULL(sum(`total_diamond_ammount`),0) as `totalDiamondAmmount`,IFNULL(sum(`total_diamond_quantity`),0) as `totalDiamondQuantity` from  `order_member_received_statistics` where 1=1
         <if test="orderState!=null">
-            and `is_finish`=#{orderState}
+            and `has_pay`=#{orderState}
         </if>
         <if test="orderOrigin!=null">
             and `order_origin`=#{orderOrigin}
@@ -53,9 +55,67 @@
                 `date` <= #{endDate}
             ]]>
         </if>
+        group  by `year`, `date`
+        order by null
     </select>
 
-    <delete id="inserMemberReceivedtList">
+    <select id="selectOrderMemberReceivedStatisticsGroupByMonth" resultType="com.xxfc.platform.order.entity.OrderMemberReceivedStatistics">
+        select `year`,`month`,IFNULL(sum(`total_amount`),0) as `totalAmount`,IFNULL(sum(`total_quantity`),0) as `totalQuantity`,IFNULL(sum(`toal_common_ammount`),0) as `toalCommonAmmount`,
+        IFNULL(sum(`total_common_quantity`),0) as `totalCommonQuantity`,IFNULL(sum(`total_gold_amount`),0) as `totalGoldAmount`,IFNULL(sum(`total_gold_quantity`),0),
+        IFNULL(sum(`total_diamond_ammount`),0) as `totalDiamondAmmount`,IFNULL(sum(`total_diamond_quantity`),0) as `totalDiamondQuantity` from  `order_member_received_statistics` where 1=1
+        <if test="orderState!=null">
+            and `has_pay`=#{orderState}
+        </if>
+        <if test="orderOrigin!=null">
+            and `order_origin`=#{orderOrigin}
+        </if>
+        <if test="payWay!=null">
+            and `pay_way`=#{payWay}
+        </if>
+        <if test="startDate!=null and endDate!=null">
+            and `date` between #{startDate} and #{endDate}
+        </if>
+        <if test="startDate!=null and endDate==null">
+            and <![CDATA[
+                `date` >= #{startDate}
+            ]]>
+        </if>
+        <if test="startDate==null and endDate!=null">
+            and <![CDATA[
+                `date` <= #{endDate}
+            ]]>
+        </if>
+        group  by `year`, `month`
+        order by null
+    </select>
 
-    </delete>
+    <select id="selectOrderMemberReceivedStatisticsGroupByWeekOfYear" resultType="com.xxfc.platform.order.entity.OrderMemberReceivedStatistics">
+        select `year`,`week_of_year`,IFNULL(sum(`total_amount`),0) as `totalAmount`,IFNULL(sum(`total_quantity`),0) as `totalQuantity`,IFNULL(sum(`toal_common_ammount`),0) as `toalCommonAmmount`
+        ,IFNULL(sum(`total_common_quantity`),0) as `totalCommonQuantity`,IFNULL(sum(`total_gold_amount`),0) as `totalGoldAmount`,IFNULL(sum(`total_gold_quantity`),0),
+        IFNULL(sum(`total_diamond_ammount`),0) as `totalDiamondAmmount`,IFNULL(sum(`total_diamond_quantity`),0) as `totalDiamondQuantity` from  `order_member_received_statistics` where 1=1
+        <if test="orderState!=null">
+            and `has_pay`=#{orderState}
+        </if>
+        <if test="orderOrigin!=null">
+            and `order_origin`=#{orderOrigin}
+        </if>
+        <if test="payWay!=null">
+            and `pay_way`=#{payWay}
+        </if>
+        <if test="startDate!=null and endDate!=null">
+            and `date` between #{startDate} and #{endDate}
+        </if>
+        <if test="startDate!=null and endDate==null">
+            and <![CDATA[
+                `date` >= #{startDate}
+            ]]>
+        </if>
+        <if test="startDate==null and endDate!=null">
+            and <![CDATA[
+                `date` <= #{endDate}
+            ]]>
+        </if>
+        group  by `year`, `week_of_year`
+        order by null
+    </select>
 </mapper>
\ No newline at end of file

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

@@ -31,10 +31,10 @@
         <result property="crtTime" column="crt_time"/>
     </resultMap>
 
-    <select id="selectOrderReceivedStatisticsList" resultMap="orderReceivedStatisticsMap">
-        select * from `order_received_statistics` where 1=1
+    <select id="selectOrderReceivedStatisticsDateList" resultType="com.xxfc.platform.order.entity.OrderReceivedStatistics">
+        select `year`,`date`,IFNULL(sum(`total_amount`),0) as `totalAmount`,IFNULL(sum(`total_quantity`),0) as `totalQuantity` from `order_received_statistics` where 1=1
         <if test="orderState!=null">
-            and `is_finish`=#{orderState}
+            and `has_pay`=#{orderState}
         </if>
         <if test="orderOrigin!=null">
             and `order_origin`=#{orderOrigin}
@@ -56,6 +56,66 @@
                 `date` <= #{endDate}
             ]]>
         </if>
+        group  by `year`, `date`
+        order by null
+    </select>
+
+    <select id="selectOrderReceivedStatisticsMonthList" resultType="com.xxfc.platform.order.entity.OrderReceivedStatistics">
+        select `year`,`month`,IFNULL(sum(`total_amount`),0) as `totalAmount`,IFNULL(sum(`total_quantity`),0) as `totalQuantity` from `order_received_statistics` where 1=1
+        <if test="orderState!=null">
+            and `has_pay`=#{orderState}
+        </if>
+        <if test="orderOrigin!=null">
+            and `order_origin`=#{orderOrigin}
+        </if>
+        <if test="payWay!=null">
+            and `pay_way`=#{payWay}
+        </if>
+
+        <if test="startDate!=null and endDate!=null">
+            and `date` between #{startDate} and #{endDate}
+        </if>
+        <if test="startDate!=null and endDate==null">
+            and <![CDATA[
+                `date` >= #{startDate}
+            ]]>
+        </if>
+        <if test="startDate==null and endDate!=null">
+            and <![CDATA[
+                `date` <= #{endDate}
+            ]]>
+        </if>
+        group  by `year`, `month`
+        order by null
+    </select>
+
+    <select id="selectOrderReceivedStatisticsWeekOfYearList" resultType="com.xxfc.platform.order.entity.OrderReceivedStatistics">
+        select `year`,`week_of_year`,IFNULL(sum(`total_amount`),0) as `totalAmount`,IFNULL(sum(`total_quantity`),0) as `totalQuantity` from `order_received_statistics` where 1=1
+        <if test="orderState!=null">
+            and `has_pay`=#{orderState}
+        </if>
+        <if test="orderOrigin!=null">
+            and `order_origin`=#{orderOrigin}
+        </if>
+        <if test="payWay!=null">
+            and `pay_way`=#{payWay}
+        </if>
+
+        <if test="startDate!=null and endDate!=null">
+            and `date` between #{startDate} and #{endDate}
+        </if>
+        <if test="startDate!=null and endDate==null">
+            and <![CDATA[
+                `date` >= #{startDate}
+            ]]>
+        </if>
+        <if test="startDate==null and endDate!=null">
+            and <![CDATA[
+                `date` <= #{endDate}
+            ]]>
+        </if>
+        group  by `year`, `week_of_year`
+        order by null
     </select>
 
     <!--按日统计-->

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

@@ -18,10 +18,10 @@
         <result property="companyId" column="company_id"/>
         <result property="crtTime" column="crt_time"/>
     </resultMap>
-    <select id="selectOrderRentVehicleReceivedStatistics" resultMap="orderRentVehicleReceivedStatisticsMap">
-        select * from `order_rent_vehicle_received_statistics` where 1=1
+    <select id="selectOrderRentVehicleReceivedStatisticsGroupByDate" resultType="com.xxfc.platform.order.entity.OrderRentVehicleReceivedStatistics">
+        select `year`,`date`,IFNULL(sum(`total_amount`),0) as `totalAmount`,IFNULL(sum(`total_quantity`),0) as `totalQuantity` from `order_rent_vehicle_received_statistics` where 1=1
         <if test="orderState!=null">
-            and `is_finish`=#{orderState}
+            and `has_pay`=#{orderState}
         </if>
         <if test="orderOrigin!=null">
             and `order_origin`=#{orderOrigin}
@@ -42,6 +42,63 @@
                 `date` <= #{endDate}
             ]]>
         </if>
+        group  by `year`, `date`
+        order by null
     </select>
 
+    <select id="selectOrderRentVehicleReceivedStatisticsGroupByMonth"  resultType="com.xxfc.platform.order.entity.OrderRentVehicleReceivedStatistics">
+        select `year`,`month`,IFNULL(sum(`total_amount`),0) as `totalAmount`,IFNULL(sum(`total_quantity`),0) as `totalQuantity` from `order_rent_vehicle_received_statistics` where 1=1
+        <if test="orderState!=null">
+            and `has_pay`=#{orderState}
+        </if>
+        <if test="orderOrigin!=null">
+            and `order_origin`=#{orderOrigin}
+        </if>
+        <if test="payWay!=null">
+            and `pay_way`=#{payWay}
+        </if>
+        <if test="startDate!=null and endDate!=null">
+            and `date` between #{startDate} and #{endDate}
+        </if>
+        <if test="startDate!=null and endDate==null">
+            and <![CDATA[
+                `date` >= #{startDate}
+            ]]>
+        </if>
+        <if test="startDate==null and endDate!=null">
+            and <![CDATA[
+                `date` <= #{endDate}
+            ]]>
+        </if>
+        group  by `year`, `month`
+        order by null
+    </select>
+
+    <select id="selectOrderRentVehicleReceivedStatisticsGroupByWeekOfYear" resultType="com.xxfc.platform.order.entity.OrderRentVehicleReceivedStatistics">
+        select `year`,`week_of_year`,IFNULL(sum(`total_amount`),0) as `totalAmount`,IFNULL(sum(`total_quantity`),0) as `totalQuantity` from `order_rent_vehicle_received_statistics` where 1=1
+        <if test="orderState!=null">
+            and `has_pay`=#{orderState}
+        </if>
+        <if test="orderOrigin!=null">
+            and `order_origin`=#{orderOrigin}
+        </if>
+        <if test="payWay!=null">
+            and `pay_way`=#{payWay}
+        </if>
+        <if test="startDate!=null and endDate!=null">
+            and `date` between #{startDate} and #{endDate}
+        </if>
+        <if test="startDate!=null and endDate==null">
+            and <![CDATA[
+                `date` >= #{startDate}
+            ]]>
+        </if>
+        <if test="startDate==null and endDate!=null">
+            and <![CDATA[
+                `date` <= #{endDate}
+            ]]>
+        </if>
+        group  by `year`, `week_of_year`
+        order by null
+    </select>
 </mapper>
\ No newline at end of file

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

@@ -23,10 +23,10 @@
         <result property="crtTime" column="crt_time"/>
     </resultMap>
 
-    <select id="selectOrderTourReceivedStatistics" resultMap="orderTourReceivedStatisticsMap">
-       select * from  `order_tour_received_statistics` where 1=1
+    <select id="selectOrderTourReceivedStatisticsGroupByDate" resultType="com.xxfc.platform.order.entity.OrderTourReceivedStatistics">
+         select `year`,`date`,IFNULL(sum(`total_amount`),0) as `totalAmount`,IFNULL(sum(`total_quantity`),0) as `totalQuantity` from  `order_tour_received_statistics` where 1=1
         <if test="orderState!=null">
-            and `is_finish`=#{orderState}
+            and `has_pay`=#{orderState}
         </if>
         <if test="orderOrigin!=null">
             and `order_origin`=#{orderOrigin}
@@ -47,6 +47,63 @@
                 `date` <= #{endDate}
             ]]>
         </if>
+        group  by `year`, `date`
+        order by null
     </select>
 
+    <select id="selectOrderTourReceivedStatisticsGroupByMonth" resultType="com.xxfc.platform.order.entity.OrderTourReceivedStatistics">
+        select `year`,`month`,IFNULL(sum(`total_amount`),0) as `totalAmount`,IFNULL(sum(`total_quantity`),0) as `totalQuantity` from  `order_tour_received_statistics` where 1=1
+        <if test="orderState!=null">
+            and `has_pay`=#{orderState}
+        </if>
+        <if test="orderOrigin!=null">
+            and `order_origin`=#{orderOrigin}
+        </if>
+        <if test="payWay!=null">
+            and `pay_way`=#{payWay}
+        </if>
+        <if test="startDate!=null and endDate!=null">
+            and `date` between #{startDate} and #{endDate}
+        </if>
+        <if test="startDate!=null and endDate==null">
+            and <![CDATA[
+                `date` >= #{startDate}
+            ]]>
+        </if>
+        <if test="startDate==null and endDate!=null">
+            and <![CDATA[
+                `date` <= #{endDate}
+            ]]>
+        </if>
+        group  by `year`, `month`
+        order by null
+    </select>
+
+    <select id="selectOrderTourReceivedStatisticsGroupByWeekOfYear" resultType="com.xxfc.platform.order.entity.OrderTourReceivedStatistics">
+        select `year`,`week_of_year`,IFNULL(sum(`total_amount`),0) as `totalAmount`,IFNULL(sum(`total_quantity`),0) as `totalQuantity` from  `order_tour_received_statistics` where 1=1
+        <if test="orderState!=null">
+            and `has_pay`=#{orderState}
+        </if>
+        <if test="orderOrigin!=null">
+            and `order_origin`=#{orderOrigin}
+        </if>
+        <if test="payWay!=null">
+            and `pay_way`=#{payWay}
+        </if>
+        <if test="startDate!=null and endDate!=null">
+            and `date` between #{startDate} and #{endDate}
+        </if>
+        <if test="startDate!=null and endDate==null">
+            and <![CDATA[
+                `date` >= #{startDate}
+            ]]>
+        </if>
+        <if test="startDate==null and endDate!=null">
+            and <![CDATA[
+                `date` <= #{endDate}
+            ]]>
+        </if>
+        group  by `year`, `week_of_year`
+        order by null
+    </select>
 </mapper>
\ No newline at end of file

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

@@ -98,7 +98,7 @@ public class ServiceTest {
 
     @Test
     public void testMemberStatistics(){
-        Date date = DateTime.parse("2019-11-15").toDate();
+        Date date = DateTime.parse("2019-11-28").toDate();
         Date startDate = DateUtil.beginOfDay(date).toJdkDate();
         Date endDate = DateUtil.endOfDay(date).toJdkDate();
         Map<Integer, String> companyMap = vehicleFeign.findCompanyMap();
@@ -128,15 +128,14 @@ public class ServiceTest {
     public void testOrderReceivedStatisticsJobHandler(){
         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,29);
+     /*   orderReceivedStatisticsJobHandler.execute("2019-11-29");*/
+        LocalDate startLocalDate = LocalDate.of(2019, 10, 1);
+        LocalDate endLocalDate = LocalDate.of(2019,11,30);
         while (startLocalDate.isBefore(endLocalDate)){
             String dateStr = startLocalDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
             startLocalDate = startLocalDate.plusDays(1);
             orderReceivedStatisticsJobHandler.execute(dateStr);
         }
-*/
 
     }
 }