绿满筐商城java服务
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
peng
昨天 11079cf5c81a047c3a343581a5cc6001fb4a2ec8 
 framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java


@@ -31,6 +31,7 @@


import cn.lili.modules.goods.service.GoodsService;


import cn.lili.modules.goods.service.GoodsSkuService;


import cn.lili.modules.lmk.domain.entity.CouponVirtual;


import cn.lili.modules.lmk.domain.vo.OrderCountByDayAndHourVO;


import cn.lili.modules.lmk.domain.vo.OrderCountVO;


import cn.lili.modules.lmk.enums.general.AdminRoleEnum;


import cn.lili.modules.lmk.enums.general.VirtualGoodsTypeEnum;


@@ -90,6 +91,7 @@


import com.baomidou.mybatisplus.core.toolkit.Wrappers;


import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;


import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;


import io.reactivex.rxjava3.core.Maybe;


import lombok.extern.slf4j.Slf4j;


import org.apache.poi.ss.usermodel.Cell;


import org.apache.poi.ss.usermodel.Row;


@@ -112,6 +114,7 @@


import java.io.InputStream;


import java.math.BigDecimal;


import java.net.URLEncoder;


import java.text.SimpleDateFormat;


import java.time.LocalDate;


import java.time.LocalDateTime;


import java.time.LocalTime;


@@ -1294,61 +1297,227 @@




    @Override


    public Result getOrderCount(StatisticsQueryParam queryParam) {


        LocalDateTime startTime = null;


        LocalDateTime endTime = LocalDateTime.now(); // 结束时间默认是当前时间


        int days = 0;


        Date startTime = null;


        Date endTime = new Date(); // 结束时间默认是当前时间


        List<String> dateList = new ArrayList<>();




        switch (queryParam.getSearchType()) {


            case "TODAY":


                // 今天：从今天0点到现在


                startTime = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);


                days = 1;


                break;


            case "YESTERDAY":


                // 昨天：从昨天0点到昨天23:59:59


                LocalDate yesterday = LocalDate.now().minusDays(1);


                startTime = LocalDateTime.of(yesterday, LocalTime.MIN);


                endTime = LocalDateTime.of(yesterday, LocalTime.MAX);


                days = 1;


                break;


            case "LAST_SEVEN":


                // 过去七天：从7天前0点到现在


                startTime = LocalDateTime.of(LocalDate.now().minusDays(6), LocalTime.MIN);


                days = 7;


                break;


            case "LAST_THIRTY":


                // 过去30天：从30天前0点到现在


                startTime = LocalDateTime.of(LocalDate.now().minusDays(29), LocalTime.MIN);


                days = 30;


                break;


            default:


                return Result.error("不支持的时间范围类型");


        Calendar calendar = Calendar.getInstance(); // 用于日期计算的日历实例


        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");


        int days = 0;


        //判断是否是按年月查询


        if (queryParam.getYear() != null && queryParam.getMonth() != null) {


            Date[] dates =CommonUtil.getMonthStartAndEnd(queryParam.getYear(),queryParam.getMonth());


            startTime = dates[0];


            endTime = dates[1];


            System.out.println("开始打印");


            System.out.println(startTime);


            System.out.println(endTime);


            Calendar tempCalendar = Calendar.getInstance();


            tempCalendar.setTime(startTime);


            days = tempCalendar.getActualMaximum(Calendar.DAY_OF_MONTH);


            for (int i = 0; i < days; i++) {


                dateList.add(sdf.format(tempCalendar.getTime()));


                tempCalendar.add(Calendar.DATE, 1); // 每天累加1天


            }


        }else{


            switch (queryParam.getSearchType()) {


                case "TODAY":


                    // 今天：从今天0点到现在


                    calendar.setTime(new Date()); // 重置为当前时间


                    calendar.set(Calendar.HOUR_OF_DAY, 0); // 小时设为0（24小时制）


                    calendar.set(Calendar.MINUTE, 0);      // 分钟设为0


                    calendar.set(Calendar.SECOND, 0);      // 秒设为0


                    calendar.set(Calendar.MILLISECOND, 0); // 毫秒设为0


                    startTime = calendar.getTime();        // 得到今天0点的Date对象


                    dateList.add(sdf.format(startTime));


                    break;


                case "YESTERDAY":


                    // 昨天：从昨天0点到昨天23:59:59.999


                    calendar.setTime(new Date());


                    calendar.add(Calendar.DATE, -1); // 日期减1天（变为昨天）




                    // 设置昨天0点


                    calendar.set(Calendar.HOUR_OF_DAY, 0);


                    calendar.set(Calendar.MINUTE, 0);


                    calendar.set(Calendar.SECOND, 0);


                    calendar.set(Calendar.MILLISECOND, 0);


                    startTime = calendar.getTime();




                    // 设置昨天23:59:59.999


                    calendar.set(Calendar.HOUR_OF_DAY, 23);


                    calendar.set(Calendar.MINUTE, 59);


                    calendar.set(Calendar.SECOND, 59);


                    calendar.set(Calendar.MILLISECOND, 999);


                    endTime = calendar.getTime();




                    dateList.add(sdf.format(startTime));


                    break;


                case "LAST_SEVEN":


                    // 过去七天：从7天前0点到现在（含今天共7天）


                    calendar.setTime(new Date());


                    calendar.add(Calendar.DATE, -6); // 日期减6天（7天前的今天）




                    // 设置7天前0点


                    calendar.set(Calendar.HOUR_OF_DAY, 0);


                    calendar.set(Calendar.MINUTE, 0);


                    calendar.set(Calendar.SECOND, 0);


                    calendar.set(Calendar.MILLISECOND, 0);


                    startTime = calendar.getTime();




                    days = 7;


                    // 循环生成7天的日期字符串


                    Calendar tempCalendar = Calendar.getInstance();


                    tempCalendar.setTime(startTime);


                    for (int i = 0; i < days; i++) {


                        dateList.add(sdf.format(tempCalendar.getTime()));


                        tempCalendar.add(Calendar.DATE, 1); // 每天累加1天


                    }


                    break;


                case "LAST_THIRTY":


                    // 过去30天：从30天前0点到现在（含今天共30天）


                    calendar.setTime(new Date());


                    calendar.add(Calendar.DATE, -29); // 日期减29天（30天前的今天）




                    // 设置30天前0点


                    calendar.set(Calendar.HOUR_OF_DAY, 0);


                    calendar.set(Calendar.MINUTE, 0);


                    calendar.set(Calendar.SECOND, 0);


                    calendar.set(Calendar.MILLISECOND, 0);


                    startTime = calendar.getTime();




                    days = 30;


                    // 循环生成30天的日期字符串


                    Calendar tempCalendar30 = Calendar.getInstance();


                    tempCalendar30.setTime(startTime);


                    for (int i = 0; i < days; i++) {


                        dateList.add(sdf.format(tempCalendar30.getTime()));


                        tempCalendar30.add(Calendar.DATE, 1); // 每天累加1天


                    }


                    break;


                default:


                    return Result.error("不支持的时间范围类型");


            }


        }




// 2. 查询该时间范围内的每日订单数量（按日期分组）


//        LambdaQueryWrapper<Order> queryWrapper = Wrappers.lambdaQuery();


//        queryWrapper.between(Order::getCreateTime, startTime, endTime);


//                // 按日期分组（提取日期部分）


//


//        // 执行查询，返回日期和数量的映射（day -> count）


//        List<Map<String, Object>> maps = baseMapper.selectMaps(queryWrapper);


//        Map<String, Long> dayCountMap = maps.stream()


//                .collect(Collectors.toMap(


//                        map -> map.get("day").toString(),  // 日期字符串（如2023-09-19）


//                        map -> Long.valueOf(map.get("count").toString())  // 订单数量


//                ));


//


//        // 3. 生成完整的日期列表（确保即使某天没有订单也会返回0）


//        List<Long> orderCounts = new ArrayList<>(days);


//        for (int i = 0; i < days; i++) {


//            // 计算当前循环对应的日期（从startTime开始的第i天）


//            LocalDate currentDate = startTime.toLocalDate().plusDays(i);


//            String dateStr = currentDate.toString(); // 转为yyyy-MM-dd格式


//            // 从映射中获取数量，没有则为0


//            orderCounts.add(dayCountMap.getOrDefault(dateStr, 0L));


//        }


        List<Map<String, Object>> maps = baseMapper.selectOrderCountByDay(startTime,endTime);




        return null;


        Map<String, Long> dayCountMap = maps.stream()


                .collect(Collectors.toMap(


                        map -> map.get("day").toString(),  // 日期字符串（如2023-09-19）


                        map -> Long.valueOf(map.get("count").toString())  // 订单数量


                ));




        List<Long> orderCounts = new ArrayList<>();


        for (String date : dateList) {


            // 核心：存在则取查询结果，不存在则补0


            orderCounts.add(dayCountMap.getOrDefault(date, 0L));


        }






        return Result.ok().data(orderCounts);


    }




    @Override


    public Result getOrderTimePeriod(StatisticsQueryParam queryParam) {


        Date startTime = null;


        Date endTime = new Date(); // 结束时间默认是当前时间


        List<String> dateList = new ArrayList<>();




        Calendar calendar = Calendar.getInstance(); // 用于日期计算的日历实例


        for (int i =0;i<24;i++){


            dateList.add(i + "点");


        }


        if (queryParam.getYear() != null && queryParam.getMonth() != null) {


            Date[] dates =CommonUtil.getMonthStartAndEnd(queryParam.getYear(),queryParam.getMonth());


            startTime = dates[0];


            endTime = dates[1];


        }else{


            switch (queryParam.getSearchType()) {


                case "TODAY":


                    // 今天：从今天0点到现在


                    calendar.setTime(new Date()); // 重置为当前时间


                    calendar.set(Calendar.HOUR_OF_DAY, 0); // 小时设为0（24小时制）


                    calendar.set(Calendar.MINUTE, 0);      // 分钟设为0


                    calendar.set(Calendar.SECOND, 0);      // 秒设为0


                    calendar.set(Calendar.MILLISECOND, 0); // 毫秒设为0


                    startTime = calendar.getTime();        // 得到今天0点的Date对象


                    break;


                case "YESTERDAY":


                    // 昨天：从昨天0点到昨天23:59:59.999


                    calendar.setTime(new Date());


                    calendar.add(Calendar.DATE, -1); // 日期减1天（变为昨天）




                    // 设置昨天0点


                    calendar.set(Calendar.HOUR_OF_DAY, 0);


                    calendar.set(Calendar.MINUTE, 0);


                    calendar.set(Calendar.SECOND, 0);


                    calendar.set(Calendar.MILLISECOND, 0);


                    startTime = calendar.getTime();




                    // 设置昨天23:59:59.999


                    calendar.set(Calendar.HOUR_OF_DAY, 23);


                    calendar.set(Calendar.MINUTE, 59);


                    calendar.set(Calendar.SECOND, 59);


                    calendar.set(Calendar.MILLISECOND, 999);


                    endTime = calendar.getTime();


                    break;


                case "LAST_SEVEN":


                    // 过去七天：从7天前0点到现在（含今天共7天）


                    calendar.setTime(new Date());


                    calendar.add(Calendar.DATE, -6); // 日期减6天（7天前的今天）




                    // 设置7天前0点


                    calendar.set(Calendar.HOUR_OF_DAY, 0);


                    calendar.set(Calendar.MINUTE, 0);


                    calendar.set(Calendar.SECOND, 0);


                    calendar.set(Calendar.MILLISECOND, 0);


                    startTime = calendar.getTime();




                    break;


                case "LAST_THIRTY":


                    // 过去30天：从30天前0点到现在（含今天共30天）


                    calendar.setTime(new Date());


                    calendar.add(Calendar.DATE, -29); // 日期减29天（30天前的今天）




                    // 设置30天前0点


                    calendar.set(Calendar.HOUR_OF_DAY, 0);


                    calendar.set(Calendar.MINUTE, 0);


                    calendar.set(Calendar.SECOND, 0);


                    calendar.set(Calendar.MILLISECOND, 0);


                    startTime = calendar.getTime();




                    break;


                default:


                    return Result.error("不支持的时间范围类型");


            }


        }








        List<Map<String, Object>> maps = baseMapper.selectOrderTimePeriod(startTime,endTime);




        Map<String, Long> countByDayHour = maps.stream()


                .collect(Collectors.toMap(


                        map -> map.get("hour").toString(),


                        map -> Long.valueOf(map.get("count").toString()),


                        Long::sum  // 如果有重复，累加count


                ));




        // 遍历查看结果


        List<Long> countList = new ArrayList<>();


        for (int i = 0; i < 24; i++) {


            String hourKey = String.valueOf(i);


            Long count = countByDayHour.getOrDefault(hourKey, 0L);


            countList.add(count);


        }




        Map<String,Object> map = new HashMap<>();


        map.put("dateData",dateList);


        map.put("countData",countList);


        //TODO 浏览数据未加入


//        map.put();




        return Result.ok().data(map);


    }




    /**


@@ -1727,7 +1896,7 @@


            row.createCell(0).setCellValue(dto.getOrderSn());


            row.createCell(1).setCellValue(dto.getOrderItemSn());


            row.createCell(2).setCellValue(dto.getGoodsName());


            row.createCell(3).setCellValue(dto.getNum());


            row.createCell(3).setCellValue(dto.getNum()!=null?dto.getNum():0);


            row.createCell(4).setCellValue(dto.getGoodsId());


            row.createCell(5).setCellValue(dto.getUnitPrice()!=null?dto.getUnitPrice():0);


            row.createCell(6).setCellValue(dto.getFlowPrice()!=null?dto.getFlowPrice():0);