Merge remote-tracking branch 'origin/master'

mitao

2024-06-05 e1f5ba620ad2f0b3f62c1faa45ad65a854a3c79a

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

@@ -1,13 +1,22 @@
package com.ruoyi.order.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.enums.AuditStatusEnum;
import com.ruoyi.common.core.enums.OrderStatusEnum;
import com.ruoyi.common.core.enums.ReturnRequestStatusEnum;
import com.ruoyi.common.core.utils.page.BeanUtils;
import com.ruoyi.order.domain.OrderReturnRequest;
import com.ruoyi.order.mapper.OrderMapper;
import com.ruoyi.order.mapper.OrderReturnRequestMapper;
import com.ruoyi.order.service.IOrderReturnRequestService;
import com.ruoyi.system.api.domain.CustomConfig;
import com.ruoyi.system.api.domain.GoodsCategory;
import com.ruoyi.system.api.domain.Member;
import com.ruoyi.system.api.domain.Order;
import com.ruoyi.system.api.domain.dto.OrderReturnDTO;
import com.ruoyi.system.api.domain.vo.OrderReturnVO;
import com.ruoyi.system.api.feignClient.SysUserClient;
import com.ruoyi.system.api.util.HuaWeiOBSUtil;
import org.springframework.stereotype.Service;
@@ -31,8 +40,16 @@
public class OrderReturnRequestServiceImpl extends ServiceImpl<OrderReturnRequestMapper, OrderReturnRequest> implements IOrderReturnRequestService {
    @Resource
    private SysUserClient sysUserClient;

    @Resource
    private OrderMapper orderMapper;

    @Override
    public void saveOrderReturnRequest(OrderReturnDTO OrderReturnDTO) {

        Order order = orderMapper.selectById(OrderReturnDTO.getOrderId());
        order.setOrderStatus(OrderStatusEnum.AFTER_SALE);
        orderMapper.updateById(order);
        OrderReturnRequest orderReturnRequest = new OrderReturnRequest();
        orderReturnRequest.setOrderId(OrderReturnDTO.getOrderId());
        orderReturnRequest.setRequestTime(LocalDateTime.now());
@@ -40,7 +57,6 @@
        orderReturnRequest.setRequestReason(OrderReturnDTO.getRequestReason());
        orderReturnRequest.setStatus(ReturnRequestStatusEnum.TO_BE_REVIEWED);
        orderReturnRequest.setAuditStatus(AuditStatusEnum.TO_BE_REVIEWED);

        List<String> urlList = new ArrayList<>();
        if (OrderReturnDTO.getAlbum().length > 0) {
            for (MultipartFile file : OrderReturnDTO.getAlbum()) {
@@ -55,11 +71,11 @@
        }

        CustomConfig returnAddressUserName = sysUserClient.getconfig("RETURN_ADDRESS_USER_NAME").getData();
        orderReturnRequest.setRecipientName(returnAddressUserName.getConfigName());
        orderReturnRequest.setRecipientName(returnAddressUserName.getConfigValue());
        CustomConfig returnAddressUserPhone = sysUserClient.getconfig("RETURN_ADDRESS_USER_PHONE").getData();
        orderReturnRequest.setRecipientPhone(returnAddressUserPhone.getConfigName());
        orderReturnRequest.setRecipientPhone(returnAddressUserPhone.getConfigValue());
        CustomConfig returnAddressUserAddress = sysUserClient.getconfig("RETURN_ADDRESS_USER_ADDRESS").getData();
        orderReturnRequest.setDetailedAddress(returnAddressUserAddress.getConfigName());
        orderReturnRequest.setDetailedAddress(returnAddressUserAddress.getConfigValue());
        this.save(orderReturnRequest);

    }
@@ -70,4 +86,13 @@
        byId.setCourierNumber(OrderReturnDTO.getCourierNumber());
        this.updateById(byId);
    }

    @Override
    public OrderReturnVO OrderReturnRequestInfo(OrderReturnDTO OrderReturnDTO) {
        LambdaQueryWrapper<OrderReturnRequest> wrapper= Wrappers.lambdaQuery();
        wrapper.eq(OrderReturnRequest::getOrderId,OrderReturnDTO.getOrderId());
        OrderReturnRequest one = this.getOne(wrapper);
        OrderReturnVO orderReturnVO = BeanUtils.copyBean(one, OrderReturnVO.class);
        return orderReturnVO;
    }
}