20220810

xiaoyong931011

2022-08-10 6b00d9b41239593e6dc7150b976f329df9132cf5

 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java

@@ -126,20 +126,19 @@
    @Override
    @Transactional
    public FebsResponse leaderOrderConfirm(ApiLeaderOrderConfirmDto apiLeaderOrderConfirmDto) {
        String ids = apiLeaderOrderConfirmDto.getIds();
        if(StrUtil.isEmpty(ids)){
        log.info("确认到达",apiLeaderOrderConfirmDto.getIds());
        List<Long> ids = apiLeaderOrderConfirmDto.getIds();
        if(CollUtil.isEmpty(ids)){
            return new FebsResponse().fail().message("请选择订单");
        }
        List<String> orderIds = StrUtil.splitTrim(ids, ",");
        for(String id : orderIds){
            long orderId = Long.parseLong(id);
        for(Long orderId : ids){
            MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectById(orderId);
            if(ObjectUtil.isEmpty(mallOrderInfo)){
                continue;
//                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("订单不是待确认到货状态");
            }
@@ -148,12 +147,9 @@

            OrderStateDto orderStateDto = new OrderStateDto();
            orderStateDto.setOrderNo(mallOrderInfo.getOrderNo());
            orderStateDto.setGoodsName(getProductNames(mallOrderInfo.getMemberId(),mallOrderInfo.getId()));
            if(2 == mallOrderInfo.getIsHome()){
                orderStateDto.setOrderState("已送达自提点");
            }else{
                orderStateDto.setOrderState("已送达自提点");
            }
            String productNames = getProductNames(mallOrderInfo.getMemberId(), mallOrderInfo.getId());
            orderStateDto.setGoodsName(StrUtil.isEmpty(productNames)?"商品":productNames);
            orderStateDto.setOrderState("已送达自提点");
            String takeUniqueCode = mallOrderInfo.getTakeUniqueCode();
            MallTeamLeader mallTeamLeader = mallTeamLeaderMapper.selectLeaderByUniqueCode(takeUniqueCode);
            orderStateDto.setAddressArea(mallTeamLeader.getAddressArea());