绿满筐商城java服务
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
zxl
2025-10-15 18a9f86a8c1fdb6c42c4212dcaa1de437f6f4861 
 framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java


@@ -35,6 +35,7 @@


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


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


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


import cn.lili.modules.lmk.mapper.LmkOrderSelectMapper;


import cn.lili.modules.lmk.service.CouponVirtualService;


import cn.lili.modules.member.entity.dos.Member;


import cn.lili.modules.member.entity.dto.MemberAddressDTO;


@@ -113,6 +114,7 @@


import javax.servlet.http.HttpServletResponse;


import java.io.InputStream;


import java.math.BigDecimal;


import java.math.RoundingMode;


import java.net.URLEncoder;


import java.text.SimpleDateFormat;


import java.time.LocalDate;


@@ -227,6 +229,11 @@




    @Autowired


    private GoodsSkuService goodsSkuService;




    @Autowired


    private LmkOrderSelectMapper lmkOrderSelectMapper;






    private final static  String LOCK_ORDER_NO_MQ="lock_order_no_mq:";


    private final static  String LOCK_EDIT_ORDER_ADDRESS="lock_edit_order_address:";


    private final static  String LOCK_COUPON_CARD="lock_coupon_card:";


@@ -277,6 +284,9 @@


                                String couponName = skuInfo.getCouponName();


                                orderItem.setCouponId(couponId);


                                orderItem.setCouponName(couponName);


                            }//订单中有定制商品将订单改为定制商品


                            else if (CustomizeFlagEnum.CUSTOMIZE.name().equals(skuInfo.getCustomizeFlag())) {


                                order.setCustomizeFlag(CustomizeFlagEnum.CUSTOMIZE.name());


                            }


                        }


                        orderItems.add(orderItem);


@@ -1255,12 +1265,31 @@


        orderLogService.saveBatch(orderLogList);


        //判断订单货物是否全部发货完毕


        Boolean delivery = true;


        log.info("打印订单货物:{}",orderItemList);




        //需要再此处判断订单是否有申请售后状态


        for (OrderItem orderItem : orderItemList) {


            if (orderItem.getDeliverNumber() < orderItem.getNum()) {


                delivery = false;


                break;


            // 先判断是否是未申请售后的订单


            if (OrderItemAfterSaleStatusEnum.NOT_APPLIED.name().equals(orderItem.getAfterSaleStatus())){


                // 发货数量小于订单数量则全发


                log.info("打印发货数量：{},该商品订单数量货物对应的:{}",orderItem.getDeliverNumber(),orderItem.getNum());


                if (orderItem.getDeliverNumber() < orderItem.getNum()) {


                    delivery = false;


                    break;


                }


            }else{


                //全部退回情况


                if(Objects.equals(orderItem.getReturnGoodsNumber(), orderItem.getNum())){


                    break;


                }


                //存在情况 退回数量不是全部退回而是部分退回


                if (orderItem.getReturnGoodsNumber() + orderItem.getDeliverNumber() < orderItem.getNum()) {


                    delivery = false;


                    break;


                }


            }


        }


        log.info("delivery状态:{}",delivery);


        //是否全部发货


        if (delivery) {


            return delivery(orderSn, invoiceNumber, logisticsId);


@@ -1380,7 +1409,7 @@


            }


        }




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


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




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


                .collect(Collectors.toMap(


@@ -1475,15 +1504,17 @@








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




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


        List<Map<String,Object>> countMap = lmkOrderSelectMapper.selectViewDataCount(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


                ));




        System.out.println("打印记录---------------------------------------");


        System.out.println(countMap);


        System.out.println("---------------------------------------");


        // 遍历查看结果


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


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


@@ -1497,6 +1528,103 @@


        map.put("countData",countList);


        //TODO 浏览数据未加入


//        map.put();




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


    }




    @Override


    public Result gerProductRepurchase(StatisticsQueryParam queryParam) {


        Date startTime = null;


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




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




        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 = lmkOrderSelectMapper.selectProductRepurchase(startTime,endTime,queryParam.getCurrentLimit());


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


        List<BigDecimal> rateData = new ArrayList<>();




        // 遍历结果集，提取数据到集合


        for (Map<String, Object> map : maps) {


            // 提取商品名（注意：键是resultMap中定义的property值"goodsName"）


            if (Objects.nonNull(map.get("goodsName"))) {


                String goodsName = map.get("goodsName").toString();


                goodsData.add(goodsName);


            }




            // 提取复购率（复购率通常是数字类型，这里用BigDecimal接收）


            if (Objects.nonNull(map.get("repurchaseRate"))) {


                // 转换为BigDecimal（根据实际类型调整，也可能是Double等）


                BigDecimal rate = new BigDecimal(map.get("repurchaseRate").toString()).setScale(2, RoundingMode.HALF_UP);


                rateData.add(rate);


            }


        }


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


        map.put("goodsData",goodsData);


        map.put("rateData",rateData);




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


    }


@@ -1517,6 +1645,7 @@


            for (Order unpaidOrder : unpaidOrders) {


                this.systemCancel(unpaidOrder.getSn(), "拼团活动结束订单未付款，系统自动取消订单", false);


            }




        }


        List<Order> paidOrders = listMap.get(PayStatusEnum.PAID.name());


        //如待参团人数大于0，并已开启虚拟成团


@@ -1834,8 +1963,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()));


@@ -1850,7 +1990,7 @@


        // 创建表头


        Row header = sheet.createRow(0);


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


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


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


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


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




@@ -1865,7 +2005,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);


@@ -1875,27 +2015,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());


        }




        //修改列宽