修改bug

rentaiming

2024-07-31 25a21b3f149aeab12123c915faa880e7c4ed7a21

修改bug

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderReturnRequestServiceImpl.java

@@ -82,14 +82,17 @@
    
    @Override
    public OrderReturnVO saveOrderReturnRequest(OrderReturnDTO OrderReturnDTO) {

        Order order = orderMapper.selectById(OrderReturnDTO.getOrderId());
        OrderReturnRequest one=null;
        if (order.getIsRequest()==2){
            throw new ServiceException("该订单已有售后");
        }
        LambdaQueryWrapper<OrderReturnRequest> wrapper= Wrappers.lambdaQuery();
        wrapper.eq(OrderReturnRequest::getOrderId,OrderReturnDTO.getOrderId());
        OrderReturnRequest orderReturnRequest = this.getOne(wrapper);
        if (orderReturnRequest!=null){
        order.setIsRequest(2);
        orderMapper.updateById(order);
        OrderReturnRequest orderReturnRequest = new OrderReturnRequest();
        orderReturnRequest.setOrderId(OrderReturnDTO.getOrderId());
        orderReturnRequest.setRequestTime(LocalDateTime.now());
        if (OrderReturnDTO.getRequestType().equals("REFUND")){
@@ -109,9 +112,39 @@
        orderReturnRequest.setRecipientPhone(returnAddressUserPhone.getConfigValue());
        CustomConfig returnAddressUserAddress = sysUserClient.getconfig("RETURN_ADDRESS_USER_ADDRESS").getData();
        orderReturnRequest.setDetailedAddress(returnAddressUserAddress.getConfigValue());
        this.save(orderReturnRequest);
            this.updateById(orderReturnRequest);
            one = this.getById(orderReturnRequest.getId());
        }else{
            order.setIsRequest(2);
            orderMapper.updateById(order);
            OrderReturnRequest orderReturnRequest1 = new OrderReturnRequest();
            orderReturnRequest1.setOrderId(OrderReturnDTO.getOrderId());
            orderReturnRequest1.setRequestTime(LocalDateTime.now());
            if (OrderReturnDTO.getRequestType().equals("REFUND")){
                orderReturnRequest1.setRequestType(RequestTypeEnum.REFUND);
            }else{
                orderReturnRequest1.setRequestType(RequestTypeEnum.REFUNDS_AND_RETURNS);
            }

        OrderReturnRequest one = this.getById(orderReturnRequest.getId());
            orderReturnRequest1.setRequestReason(OrderReturnDTO.getRequestReason());
            orderReturnRequest1.setStatus(ReturnRequestStatusEnum.TO_BE_REVIEWED);
            orderReturnRequest1.setAuditStatus(AuditStatusEnum.TO_BE_REVIEWED);
            orderReturnRequest1.setAlbum(OrderReturnDTO.getAlbum());
            orderReturnRequest1.setRemark(OrderReturnDTO.getRemark());
            CustomConfig returnAddressUserName = sysUserClient.getconfig("RETURN_ADDRESS_USER_NAME").getData();
            orderReturnRequest1.setRecipientName(returnAddressUserName.getConfigValue());
            CustomConfig returnAddressUserPhone = sysUserClient.getconfig("RETURN_ADDRESS_USER_PHONE").getData();
            orderReturnRequest1.setRecipientPhone(returnAddressUserPhone.getConfigValue());
            CustomConfig returnAddressUserAddress = sysUserClient.getconfig("RETURN_ADDRESS_USER_ADDRESS").getData();
            orderReturnRequest1.setDetailedAddress(returnAddressUserAddress.getConfigValue());
            this.save(orderReturnRequest1);
            one = this.getById(orderReturnRequest1.getId());
        }





        OrderReturnVO orderReturnVO = BeanUtils.copyBean(one, OrderReturnVO.class);
        return orderReturnVO;