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


@@ -10,6 +10,7 @@


import cn.hutool.poi.excel.ExcelReader;


import cn.hutool.poi.excel.ExcelUtil;


import cn.hutool.poi.excel.ExcelWriter;


import cn.lili.base.Result;


import cn.lili.common.enums.ClientTypeEnum;


import cn.lili.common.enums.PromotionTypeEnum;


import cn.lili.common.enums.ResultCode;


@@ -30,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;


@@ -56,6 +58,7 @@


import cn.lili.modules.promotion.entity.dos.Pintuan;


import cn.lili.modules.promotion.service.CouponService;


import cn.lili.modules.promotion.service.PintuanService;


import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam;


import cn.lili.modules.store.entity.dto.StoreDeliverGoodsAddressDTO;


import cn.lili.modules.store.service.StoreDetailService;


import cn.lili.modules.system.aspect.annotation.SystemLogPoint;


@@ -86,7 +89,9 @@


import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;


import com.baomidou.mybatisplus.core.metadata.IPage;


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;


@@ -109,6 +114,10 @@


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;


import java.util.*;


import java.util.concurrent.TimeUnit;


import java.util.stream.Collectors;


@@ -1286,6 +1295,231 @@


        return order;


    }




    @Override


    public Result getOrderCount(StatisticsQueryParam queryParam) {


        Date startTime = null;


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


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




        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("不支持的时间范围类型");


            }


        }




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




        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);


    }




    /**


     * 虚拟成团


     *


@@ -1620,8 +1854,19 @@


            orderExportDetailDTO.setPaymentMethod(CharSequenceUtil.isNotBlank(orderExportDTO.getPaymentMethod()) ? PaymentMethodEnum.valueOf(orderExportDTO.getPaymentMethod()).paymentName() : "");


            orderExportDetailDTO.setClientType(ClientTypeEnum.valueOf(orderExportDTO.getClientType()).value());


            orderExportDetailDTO.setOrderType(orderExportDTO.getOrderType().equals(OrderTypeEnum.NORMAL.name()) ? "普通订单" : "虚拟订单");


            orderExportDetailDTO.setAfterSaleStatus(OrderItemAfterSaleStatusEnum.valueOf(orderExportDTO.getAfterSaleStatus()).description());




            String afterSaleStatus = orderExportDTO.getAfterSaleStatus();


            if (StringUtils.isNotBlank(afterSaleStatus)) {


                try {


                    orderExportDetailDTO.setAfterSaleStatus(OrderItemAfterSaleStatusEnum.valueOf(afterSaleStatus).description());


                } catch (IllegalArgumentException e) {


                    // 处理枚举值不存在的情况


                    orderExportDetailDTO.setAfterSaleStatus("未知状态");


                }


            } else {


                // 设置默认值或空字符串


                orderExportDetailDTO.setAfterSaleStatus("无售后状态");


            }


            //时间


            orderExportDetailDTO.setCreateTime(DateUtil.formatDateTime(orderExportDTO.getCreateTime()));


            orderExportDetailDTO.setPaymentTime(DateUtil.formatDateTime(orderExportDTO.getPaymentTime()));


@@ -1636,7 +1881,7 @@


        // 创建表头


        Row header = sheet.createRow(0);


        String[] headers = {"主订单编号", "子订单编号", "选购商品", "商品数量", "商品ID", "商品单价", "订单应付金额",


                "运费", "优惠总金额", "平台优惠", "商家优惠", "商家改价", "支付方式","买家名称", "收件人", "收件人手机号",


                "运费", "优惠总金额", "平台优惠", "商家优惠", "商家改价", "支付方式","会员ID","买家名称", "收件人", "收件人手机号",


                "省", "市", "区", "街道", "详细地址", "买家留言", "订单提交时间", "支付完成时间", "来源",


                "订单状态", "订单类型", "售后状态", "取消原因", "发货时间", "完成时间", "店铺"};




@@ -1651,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);


@@ -1661,27 +1906,27 @@


            row.createCell(10).setCellValue(dto.getStoreMarketingCost()!=null?dto.getStoreMarketingCost():0);


            row.createCell(11).setCellValue(dto.getUpdatePrice()!=null?dto.getUpdatePrice():0);


            row.createCell(12).setCellValue(dto.getPaymentMethod());


            row.createCell(13).setCellValue(dto.getMemberId());


            row.createCell(14).setCellValue(dto.getNickName());




            row.createCell(13).setCellValue(dto.getNickName());




            row.createCell(14).setCellValue(dto.getConsigneeName());


            row.createCell(15).setCellValue(dto.getConsigneeMobile());


            row.createCell(16).setCellValue(dto.getProvince());


            row.createCell(17).setCellValue(dto.getCity());


            row.createCell(18).setCellValue(dto.getDistrict());


            row.createCell(19).setCellValue(dto.getStreet());


            row.createCell(20).setCellValue(dto.getConsigneeDetail());


            row.createCell(21).setCellValue(dto.getRemark());


            row.createCell(22).setCellValue(dto.getCreateTime());


            row.createCell(23).setCellValue(dto.getPaymentTime());


            row.createCell(24).setCellValue(dto.getClientType());


            row.createCell(25).setCellValue(dto.getOrderStatus());


            row.createCell(26).setCellValue(dto.getOrderType());


            row.createCell(27).setCellValue(dto.getAfterSaleStatus());


            row.createCell(28).setCellValue(dto.getCancelReason());


            row.createCell(29).setCellValue(dto.getLogisticsTime());


            row.createCell(30).setCellValue(dto.getCompleteTime());


            row.createCell(31).setCellValue(dto.getStoreName());


            row.createCell(15).setCellValue(dto.getConsigneeName());


            row.createCell(16).setCellValue(dto.getConsigneeMobile());


            row.createCell(17).setCellValue(dto.getProvince());


            row.createCell(18).setCellValue(dto.getCity());


            row.createCell(19).setCellValue(dto.getDistrict());


            row.createCell(20).setCellValue(dto.getStreet());


            row.createCell(21).setCellValue(dto.getConsigneeDetail());


            row.createCell(22).setCellValue(dto.getRemark());


            row.createCell(23).setCellValue(dto.getCreateTime());


            row.createCell(24).setCellValue(dto.getPaymentTime());


            row.createCell(25).setCellValue(dto.getClientType());


            row.createCell(26).setCellValue(dto.getOrderStatus());


            row.createCell(27).setCellValue(dto.getOrderType());


            row.createCell(28).setCellValue(dto.getAfterSaleStatus());


            row.createCell(29).setCellValue(dto.getCancelReason());


            row.createCell(30).setCellValue(dto.getLogisticsTime());


            row.createCell(31).setCellValue(dto.getCompleteTime());


            row.createCell(32).setCellValue(dto.getStoreName());


        }




        //修改列宽