20220902

xiaoyong931011

2022-09-08 ab6603d889f482459c1812e52ce2c5c04fe8e3e7

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

@@ -462,7 +462,8 @@
    @Override
    public OrderDetailVo findOrderDetailsById(Long id) {
        MallOrderInfo orderInfo = this.baseMapper.selectOrderDetailsById(id);
        if (orderInfo == null || AppContants.DEL_FLAG_Y == orderInfo.getDelFlag()) {
//        if (orderInfo == null || AppContants.DEL_FLAG_Y == orderInfo.getDelFlag()) {
        if (ObjectUtil.isNull(orderInfo)) {
            throw new FebsException("订单不存在");
        }

@@ -504,6 +505,11 @@

        if (orderInfo.getDeliveryState() != OrderDeliveryStateEnum.DELIVERY_FINISH.getValue()) {
            throw new FebsException("还未送至自提点");
        }

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

        orderInfo.setStatus(OrderStatusEnum.FINISH.getValue());
@@ -797,4 +803,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("已取消");
    }

}