feat(order): 添加自提点订单确认功能

Administrator

2025-05-23 ea8e4abfb8c81cdae4d2a8743d81b615000f352d

 src/main/java/cc/mrbird/febs/mall/controller/order/AdminMallOrderController.java

@@ -353,6 +353,12 @@
        ExcelUtil.createWorkbookAtOutStream(ExcelVersion.V2007, res, os, true);
        return null;
    }
    @GetMapping("refundOrder")
    @ControllerEndpoint(operation = "后台退货", exceptionMessage = "操作失败")
    public FebsResponse confirmOrder(AdminRefundOrderDto dto){

        return adminMallOrderService.confirmOrder(dto);
    }

    @GetMapping("confirmOrder")
    @ControllerEndpoint(operation = "确认货到达自提点", exceptionMessage = "操作失败")
@@ -373,6 +379,44 @@
                return new FebsResponse().fail().message("配送状态不是配送中状态");
            }
            mallOrderInfo.setDeliveryState(OrderDeliveryStateEnum.DELIVERY_FINISH.getValue());
            mallOrderInfoMapper.updateById(mallOrderInfo);

//            OrderStateDto orderStateDto = new OrderStateDto();
//            String productNames = getProductNames(mallOrderInfo.getMemberId(), mallOrderInfo.getId());
//            orderStateDto.setGoodsName(StrUtil.sub(productNames,0,15)+"...");
//            String takeUniqueCode = mallOrderInfo.getTakeUniqueCode();
//            MallTeamLeader mallTeamLeader = mallTeamLeaderMapper.selectLeaderByUniqueCode(takeUniqueCode);
//            orderStateDto.setAddressArea(mallTeamLeader.getAddressArea());
//            orderStateDto.setDetailAddress(StrUtil.sub(mallTeamLeader.getDetailAddress(),0,20)+"...");
//            orderStateDto.setRemark("果蔬等生鲜,请尽快取货");
//            orderStateDto.setLeaderPhone(mallTeamLeader.getPhone());
//            orderStateDto.setOpenId(mallMemberMapper.selectById(mallOrderInfo.getMemberId()).getOpenId());
//            DataDictionaryCustom dataDictionaryCustom = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.WX_TEMPLATE_ID_THREE.getType(), DataDictionaryEnum.WX_TEMPLATE_ID_THREE.getCode());
//            orderStateDto.setTemplateId(dataDictionaryCustom.getValue());
//            iXcxPayService.pushOrderToAddress(orderStateDto);
//            iXcxPayService.uniformMessageSend(orderStateDto);
        }
        return new FebsResponse().success();
    }

    @GetMapping("confirmLeaderOrder")
    @ControllerEndpoint(operation = "确认货到达自提点", exceptionMessage = "操作失败")
    public FebsResponse confirmLeaderOrder(MallOrderInfo mallOrderInfoDto){
        String orderIds = mallOrderInfoDto.getOrderIds();
        List<String> ids = StrUtil.splitTrim(orderIds, ",");
        for(String id : ids){
            long orderId = Long.parseLong(id);
            MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectById(orderId);
            if(ObjectUtil.isEmpty(mallOrderInfo)){
//                continue;
                return new FebsResponse().fail().message("订单不存在");
            }
            Integer status = mallOrderInfo.getStatus() == null ? 0 : mallOrderInfo.getStatus();
            if(OrderStatusEnum.WAIT_SHIPPING.getValue() != status){
//                continue;
                return new FebsResponse().fail().message("订单不是待发货状态");
            }
            mallOrderInfo.setStatus(OrderStatusEnum.WAIT_FINISH.getValue());
            mallOrderInfoMapper.updateById(mallOrderInfo);

//            OrderStateDto orderStateDto = new OrderStateDto();
@@ -469,7 +513,7 @@
        orderSheet.setTitle(title);
//        String[] header = {"订单编号", "订单详情（商品*数量）", "订单金额", "用户提货码", "配送方式", "用户姓名", "用户电话","用户地址", "团长名称", "团长手机号码", "自提点名称"};

        String[] header = {"订单编号", "订单详情（商品*数量）", "订单金额", "用户提货码", "用户姓名", "用户电话","用户地址", "团长名称", "团长手机号码", "自提点名称"};
        String[] header = {"订单编号", "订单详情（商品*数量）", "订单金额", "用户提货码", "用户姓名", "用户电话","用户地址", "自提点名称", "自提点号码", "自提点名称"};
        orderSheet.setHeaders(header);

        QueryRequest request = new QueryRequest();