Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-10 6f54cebf07887237f5eb8efdf9d1d0b784dbaa49

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java

@@ -127,13 +127,14 @@
            orderDetailVO.setDistributionMode(goods.getDistributionMode());
        }

        R<Technician> shopdetail = technicianClient.shopdetail(order.getTechnicianId());
        if (shopdetail.getCode() != R.SUCCESS){
            throw new ServiceException("获取技师信息失败");
        Technician technician = new Technician();
        if (order.getTechnicianId() != null){
            R<Technician> shopdetail = technicianClient.shopdetail(order.getTechnicianId());
            if (shopdetail.getCode() != R.SUCCESS){
                throw new ServiceException("获取技师信息失败");
            }
            technician = shopdetail.getData();
        }
        Technician technician = shopdetail.getData();


        Shop shop = shopR.getData();
        orderDetailVO.setId(order.getId());
        orderDetailVO.setOrderStatus(order.getOrderStatus());