20220810

xiaoyong931011

2022-08-10 fa4b399a1cfa43720b1f0a14fb3ca692a5ed1ea7

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

@@ -309,7 +309,7 @@
//                return new FebsResponse().fail().message("订单不存在");
            }
            Integer status = mallOrderInfo.getStatus();
            if(OrderStatusEnum.WAIT_FINISH.getValue() != status){
            if(OrderStatusEnum.WAIT_FINISH.getValue() != status && mallOrderInfo.getDeliveryState() != 2){
                continue;
//                return new FebsResponse().fail().message("订单不是待确认到货状态");
            }
@@ -319,11 +319,7 @@
            OrderStateDto orderStateDto = new OrderStateDto();
            orderStateDto.setOrderNo(mallOrderInfo.getOrderNo());
            orderStateDto.setGoodsName(getProductNames(mallOrderInfo.getMemberId(),mallOrderInfo.getId()));
            if(2 == mallOrderInfo.getIsHome()){
                orderStateDto.setOrderState("已送达自提点");
            }else{
                orderStateDto.setOrderState("已送达自提点");
            }
            orderStateDto.setOrderState("已送达自提点");
            String takeUniqueCode = mallOrderInfo.getTakeUniqueCode();
            MallTeamLeader mallTeamLeader = mallTeamLeaderMapper.selectLeaderByUniqueCode(takeUniqueCode);
            orderStateDto.setAddressArea(mallTeamLeader.getAddressArea());