Merge remote-tracking branch 'origin/master'

rentaiming

2024-06-22 98933984fa1353d298a5117fb2a2d044fc51af93

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

@@ -33,10 +33,7 @@
import com.ruoyi.system.api.domain.vo.OrderReturnVO;
import com.ruoyi.system.api.feignClient.MemberClient;
import com.ruoyi.system.api.feignClient.SysUserClient;
import com.ruoyi.system.api.util.HuaWeiOBSUtil;
import java.io.IOException;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -47,7 +44,6 @@
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;

/**
 * <p>
@@ -59,6 +55,8 @@
 */
@Service
public class OrderReturnRequestServiceImpl extends ServiceImpl<OrderReturnRequestMapper, OrderReturnRequest> implements IOrderReturnRequestService {


    @Resource
    private SysUserClient sysUserClient;

@@ -71,11 +69,9 @@
    @Resource
    private PaylogServiceImpl paylogService;
    @Override
    public void saveOrderReturnRequest(OrderReturnDTO OrderReturnDTO) {
    public OrderReturnVO 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());
@@ -83,19 +79,7 @@
        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()) {
                try {
                    String url = HuaWeiOBSUtil.obsUpload(file);
                    urlList.add(url);
                } catch (IOException e) {
                    throw new RuntimeException(e);
                }
            }
            orderReturnRequest.setAlbum(urlList.toString());
        }

        orderReturnRequest.setAlbum(OrderReturnDTO.getAlbum());
        CustomConfig returnAddressUserName = sysUserClient.getconfig("RETURN_ADDRESS_USER_NAME").getData();
        orderReturnRequest.setRecipientName(returnAddressUserName.getConfigValue());
        CustomConfig returnAddressUserPhone = sysUserClient.getconfig("RETURN_ADDRESS_USER_PHONE").getData();
@@ -103,6 +87,10 @@
        CustomConfig returnAddressUserAddress = sysUserClient.getconfig("RETURN_ADDRESS_USER_ADDRESS").getData();
        orderReturnRequest.setDetailedAddress(returnAddressUserAddress.getConfigValue());
        this.save(orderReturnRequest);

        OrderReturnRequest one = this.getById(orderReturnRequest.getId());
        OrderReturnVO orderReturnVO = BeanUtils.copyBean(one, OrderReturnVO.class);
        return orderReturnVO;

    }

@@ -120,6 +108,25 @@
        OrderReturnRequest one = this.getOne(wrapper);
        OrderReturnVO orderReturnVO = BeanUtils.copyBean(one, OrderReturnVO.class);
        return orderReturnVO;
    }

    @Override
    public void qxReturnRequest(OrderReturnDTO OrderReturnDTO) {
        OrderReturnRequest byId = this.getById(OrderReturnDTO.getId());
        byId.setStatus(ReturnRequestStatusEnum.QX);
        Order order = orderMapper.selectById(byId.getOrderId());
        order.setOrderStatus(OrderStatusEnum.FINISHED);
        orderMapper.updateById(order);
        this.updateById(byId);
    }

    @Override
    public void wlReturnRequest(OrderReturnDTO OrderReturnDTO) {
        OrderReturnRequest byId = this.getById(OrderReturnDTO.getId());
        byId.setStatus(ReturnRequestStatusEnum.TO_BE_RECEIVED_BY_THE_PLATFORM);
        byId.setLogisticsNum(OrderReturnDTO.getLogistics());
        byId.setCourierNumber(OrderReturnDTO.getCourierNumber());
        this.updateById(byId);
    }

    /**
@@ -253,9 +260,7 @@
            boolean result = handleRefund(paymentMethod, paylog, orderNo);
            if (result) {
                paylog.setState(3);// 已退款
                order.setOrderStatus(OrderStatusEnum.REFUNDED);
                paylogService.updateById(paylog);
                orderMapper.updateById(order);
            }
        }
    }