Administrator
2025-05-27 3b76729ac45f9c9e604e201099799ed8093ba4ac
refactor(mall): 优化订单导出功能

- 修改订单导出表格的表头,将"自提点号码"改为"联系号码"
- 优化订单导出逻辑,通过订单ID和提货码获取订单信息
- 添加团长期信息查询,用于导出表格中的联系人信息
-调整表格数据添加逻辑,使用团长期信息替代原有的自提点信息
1 files modified
13 ■■■■■ changed files
src/main/java/cc/mrbird/febs/mall/controller/order/AdminMallOrderController.java 13 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/controller/order/AdminMallOrderController.java
@@ -513,7 +513,7 @@
        orderSheet.setTitle(title);
//        String[] header = {"订单编号", "订单详情(商品*数量)", "订单金额", "用户提货码", "配送方式", "用户姓名", "用户电话","用户地址", "团长名称", "团长手机号码", "自提点名称"};
        String[] header = {"订单编号", "订单详情(商品*数量)", "订单金额", "用户提货码", "用户姓名", "用户电话","用户地址", "自提点名称", "自提点号码", "自提点名称"};
        String[] header = {"订单编号", "订单详情(商品*数量)", "订单金额", "用户提货码", "用户姓名", "用户电话","用户地址", "联系人", "联系号码", "自提点名称"};
        orderSheet.setHeaders(header);
        QueryRequest request = new QueryRequest();
@@ -522,13 +522,17 @@
        List<MallOrderInfo> dataList = new ArrayList<>();
                String orderIds = mallOrderInfo.getOrderIds();
        List<String> ids = StrUtil.splitTrim(orderIds, ",");
        String takeUniqueCode = "";
        for(String id : ids){
            long orderId = Long.parseLong(id);
            MallOrderInfo mallOrderInfo1 = mallOrderInfoMapper.selectAllOrderInfoByIdAndTakeUniqueCode(orderId,mallOrderInfo.getTakeUniqueCode());
            if(ObjectUtil.isNotEmpty(mallOrderInfo1)){
                dataList.add(mallOrderInfo1);
                takeUniqueCode = mallOrderInfo1.getTakeUniqueCode();
            }
        }
        MallTeamLeader mallTeamLeader = mallTeamLeaderMapper.selectLeaderByUniqueCode(takeUniqueCode);
//        List<MallOrderInfo> dataList = adminMallOrderService.findOrderListInPage(mallOrderInfo, request).getRecords();
        List<List<Object>> list = new ArrayList<>();
        if (CollUtil.isNotEmpty(dataList)) {
@@ -556,9 +560,9 @@
                temp.add(item.getPhone());
                temp.add(item.getAddress());
                temp.add(item.getLeaderName());
                temp.add(item.getLeaderPhone());
                temp.add(item.getAddressArea());
                temp.add(mallTeamLeader.getName());
                temp.add(mallTeamLeader.getPhone());
                temp.add(mallTeamLeader.getAddressArea());
                list.add(temp);
//                adminMallOrderService.updateOrderStateAndDeliveryState(item.getId(), OrderStatusEnum.WAIT_FINISH.getValue(), OrderDeliveryStateEnum.DELIVERY_ING.getValue());
            }
@@ -566,7 +570,6 @@
        orderSheet.setDataList(list);
        res.add(orderSheet);
        response = ResponseHeadUtil.setExcelHead(response);
        MallTeamLeader mallTeamLeader = mallTeamLeaderMapper.selectLeaderByUniqueCode(mallOrderInfo.getTakeUniqueCode());
        String name = mallTeamLeader.getName();
        response.setHeader("Content-Disposition",
                "attachment;filename=" + URLEncoder.encode(name+"-"+title + DateUtil.format(new Date(), "yyyyMMDDHHmmss") + ".xlsx".trim(), "UTF-8"));