20220902

xiaoyong931011

2022-09-07 423e9bfb73d7f55156eb4996a13911972b1fb665

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

@@ -506,6 +506,11 @@
            throw new FebsException("还未送至自提点");
        }

        List<MallRefundEntity> mallRefundEntities = mallRefundMapper.selectByItemIdAndOrderIdAndState(null, orderInfo.getId(), 3);
        if(CollUtil.isNotEmpty(mallRefundEntities)){
            throw new FebsException("请先处理退款商品");
        }

        orderInfo.setStatus(OrderStatusEnum.FINISH.getValue());
        orderInfo.setReceivingTime(new Date());
        this.baseMapper.updateById(orderInfo);
@@ -737,10 +742,7 @@
                if(mallRefund.getState() == 1){
                    return new FebsResponse().fail().message("订单已退款");
                }
                if(mallRefund.getState() == 3){
                    return new FebsResponse().fail().message("订单退款中");
                }
                if(mallRefund.getState() == 2){
                if(mallRefund.getState() == 2 || mallRefund.getState() == 3){
                    mallRefundEntity.setId(mallRefund.getId());
                    mallRefundEntity.setRefundNo(mallRefund.getRefundNo());
                    mallRefundEntity.setMemberId(mallRefund.getMemberId());
@@ -800,4 +802,16 @@
        return new FebsResponse().success().message("已申请");
    }

    @Override
    public FebsResponse cancelRefundOrder(Long id) {
        MallRefundEntity mallRefundEntity = mallRefundMapper.selectById(id);
        mallRefundEntity.setState(2);
        mallRefundMapper.updateById(mallRefundEntity);
        Long itemId = mallRefundEntity.getItemId();
        MallOrderItem mallOrderItem = mallOrderItemMapper.selectById(itemId);
        mallOrderItem.setState(1);
        mallOrderItemMapper.updateById(mallOrderItem);
        return new FebsResponse().success().message("已取消");
    }

}