无关风月
2025-04-22 67f416634f95c81e618123b826e18a57ae08220d
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java
@@ -381,7 +381,7 @@
        Order orderData = orderClient.detail(order.getOrderId()).getData();
        if(!order.getTime().equals(orderData.getTime()) || !order.getServerId().equals(orderData.getServerId())){
        if(!order.getTime().equals(orderData.getTime()) || (Objects.nonNull(order.getServerId())&&Objects.nonNull(orderData.getServerId())&&!order.getServerId().equals(orderData.getServerId()))){
            // 修改sys_change_dispatch 为已改派
            dispatchClient.changeReason(order.getOrderId(),"");
        }
@@ -562,8 +562,12 @@
        R<List<Order>> result = orderClient.excelExport(orderQueryRequest);
        for (Order datum : result.getData()) {
            datum.setServeName(around(datum.getServeName(), 1, datum.getServeName().length()-1));
            datum.setServerPhone(around(datum.getServerPhone(), 3, 4));
            if(StringUtils.hasLength(datum.getServerName())){
                datum.setServerName(datum.getServerName().charAt(0)+"***");
            }
            if(StringUtils.hasLength(datum.getServerPhone())){
                datum.setServerPhone(around(datum.getServerPhone(), 3, 4));
            }
        }
        // 独立orderService
        return orderService.excelExport(result.getData(), response);