Administrator
2025-05-27 09d1fb5dcfa7a8c5fae1c570ec4256d05b82617d
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -287,8 +287,8 @@
            delivaryAmount = addOrderDto.getDeliveryAmount() == null ? BigDecimal.ZERO : addOrderDto.getDeliveryAmount();
            orderInfo.setCarriage(delivaryAmount);
        }else{
            MallTeamLeader mallTeamLeader = mallTeamLeaderMapper.selectLeaderByUniqueCode(orderInfo.getTakeUniqueCode());
            if(mallTeamLeader!=null){
            MallTeamLeader mallTeamLeader = mallTeamLeaderMapper.selectLeaderByUniqueCode(addOrderDto.getTakeUniqueCode());
            if(ObjectUtil.isEmpty(mallTeamLeader)){
                throw new FebsException("自提点信息异常");
            }
            orderInfo.setCarriage(delivaryAmount);
@@ -904,6 +904,16 @@
        if (orderInfo.getStatus() != OrderStatusEnum.WAIT_FINISH.getValue()) {
            throw new FebsException("该状态不能确认收货");
        }
        if(1 == orderInfo.getDeliveryType()){
            List<MallOrderItem> mallOrderItems = mallOrderItemMapper.selectList(
                    new LambdaQueryWrapper<MallOrderItem>()
                            .eq(MallOrderItem::getOrderId, id)
                            .eq(MallOrderItem::getLeaderState, 0)
            );
            if(CollUtil.isNotEmpty(mallOrderItems)){
                throw new FebsException("请先核销"+mallOrderItems.get(0).getGoodsName());
            }
        }
        List<MallRefundEntity> mallRefundEntities = mallRefundMapper.selectByItemIdAndOrderIdAndState(null, orderInfo.getId(), 3);
        if(CollUtil.isNotEmpty(mallRefundEntities)){