20220902

xiaoyong931011

2022-09-24 aa2885980b4b6aeb309aab9762a6220e903b498a

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

@@ -345,21 +345,45 @@
            mallOrderInfoMapper.updateById(mallOrderInfo);

            OrderStateDto orderStateDto = new OrderStateDto();
            orderStateDto.setOrderNo(mallOrderInfo.getOrderNo());
            String productNames = getProductNames(mallOrderInfo.getMemberId(), mallOrderInfo.getId());
            orderStateDto.setGoodsName(StrUtil.sub(productNames,0,10)+"...");
            orderStateDto.setOrderState("待自提");
            orderStateDto.setTakeCode(mallOrderInfo.getTakeCode());
            orderStateDto.setGoodsName(StrUtil.sub(productNames,0,15)+"...");
            String takeUniqueCode = mallOrderInfo.getTakeUniqueCode();
            MallTeamLeader mallTeamLeader = mallTeamLeaderMapper.selectLeaderByUniqueCode(takeUniqueCode);
            orderStateDto.setAddressArea(StrUtil.sub(mallTeamLeader.getAddressArea(),0,10)+"...");
            orderStateDto.setDetailAddress(StrUtil.sub(mallTeamLeader.getDetailAddress(),0,10)+"...");
            orderStateDto.setAmount(mallOrderInfo.getAmount().toString());
            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("deliverOrder")
    @ControllerEndpoint(operation = "导出订单列表，系统自动发货", exceptionMessage = "操作失败")
    public FebsResponse deliverOrder(MallOrderInfo mallOrderInfoDto){
        String orderIds = mallOrderInfoDto.getOrderIds();
        List<String> ids = StrUtil.splitTrim(orderIds, ",");
        for(String id : ids){
            long orderId = Long.parseLong(id);
            MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectByIdAndTakeUniqueCode(orderId,mallOrderInfoDto.getTakeUniqueCode());
            if(ObjectUtil.isEmpty(mallOrderInfo)){
                return new FebsResponse().fail().message("订单不存在");
            }
            Integer status = mallOrderInfo.getStatus() == null ? 0 : mallOrderInfo.getStatus();
            Integer deliveryState = mallOrderInfo.getDeliveryState() == null ? 0 : mallOrderInfo.getDeliveryState();
            if(OrderStatusEnum.WAIT_SHIPPING.getValue() != status){
//                continue;
                return new FebsResponse().fail().message("状态不是待发货");
            }
            if(1 != deliveryState){
//                continue;
                return new FebsResponse().fail().message("配送状态不是待配送");
            }
            adminMallOrderService.updateOrderStateAndDeliveryState(mallOrderInfo.getId(), OrderStatusEnum.WAIT_FINISH.getValue(), OrderDeliveryStateEnum.DELIVERY_ING.getValue());
        }
        return new FebsResponse().success();
    }
@@ -411,23 +435,26 @@
        String title = "订单列表";
        orderSheet.setSheetName(title);
        orderSheet.setTitle(title);
        String[] header = {"订单编号", "订单金额", "下单时间", "配送方式", "收货姓名", "收货电话", "商品名称", "团长名称", "团长手机号码", "自提点名称","详细地址"};
        String[] header = {"订单编号", "商品名称", "订单金额", "提货码", "配送方式", "收货姓名", "收货电话", "团长名称", "团长手机号码", "自提点名称","详细地址"};
        orderSheet.setHeaders(header);

        QueryRequest request = new QueryRequest();
        request.setPageNum(1);
        request.setPageSize(9999);
        List<MallOrderInfo> dataList = adminMallOrderService.findOrderListInPage(mallOrderInfo, request).getRecords();
        List<MallOrderInfo> dataList = new ArrayList<>();
                String orderIds = mallOrderInfo.getOrderIds();
        List<String> ids = StrUtil.splitTrim(orderIds, ",");
        for(String id : ids){
            long orderId = Long.parseLong(id);
            MallOrderInfo mallOrderInfo1 = mallOrderInfoMapper.selectAllOrderInfoByIdAndTakeUniqueCode(orderId,mallOrderInfo.getTakeUniqueCode());
            dataList.add(mallOrderInfo1);
        }
//        List<MallOrderInfo> dataList = adminMallOrderService.findOrderListInPage(mallOrderInfo, request).getRecords();
        List<List<Object>> list = new ArrayList<>();
        if (dataList.size() > 0) {
            for (MallOrderInfo item : dataList) {
                List<Object> temp = new ArrayList<>();
                temp.add(item.getOrderNo());
                temp.add(item.getAmount());
                temp.add(DateUtil.format(item.getOrderTime(), "yyyy-MM-dd HH:mm:ss"));
                temp.add("自提");
                temp.add(item.getName());
                temp.add(item.getPhone());
                if (CollUtil.isNotEmpty(item.getItems())) {
                    StringBuilder sb = new StringBuilder();

@@ -442,13 +469,18 @@
                } else {
                    temp.add("");
                }
                temp.add(item.getAmount());
                temp.add(item.getTakeCode());
                temp.add("自提");
                temp.add(item.getName());
                temp.add(item.getPhone());

                temp.add(item.getLeaderName());
                temp.add(item.getLeaderPhone());
                temp.add(item.getAddressArea());
                temp.add(item.getDetailAddress());
                list.add(temp);

                adminMallOrderService.updateOrderStateAndDeliveryState(item.getId(), OrderStatusEnum.WAIT_FINISH.getValue(), OrderDeliveryStateEnum.DELIVERY_ING.getValue());
//                adminMallOrderService.updateOrderStateAndDeliveryState(item.getId(), OrderStatusEnum.WAIT_FINISH.getValue(), OrderDeliveryStateEnum.DELIVERY_ING.getValue());
            }
        }
        orderSheet.setDataList(list);