1.

phpcjl

2024-12-10 be5deec4ab1df560c1c801855957b2202f4bc1d5

1.

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/OrderDetailVO.java

@@ -83,4 +83,7 @@
    @ApiModelProperty(value = "技师名称")
    private String technicianName;

    @ApiModelProperty(value = "预约单id")
    private Long technicianSubscribeId;

}

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

@@ -142,6 +142,12 @@
            }
            technician = shopdetail.getData();
        }
        R<TechnicianSubscribe> subscribeR = technicianClient.getSubscribeByOrderId(orderId);
        if (!R.isSuccess(subscribeR)){
            throw new ServiceException("获取预约信息失败");
        }
        TechnicianSubscribe subscribe = subscribeR.getData();

        Shop shop = shopR.getData();
        orderDetailVO.setId(order.getId());
        orderDetailVO.setOrderStatus(order.getOrderStatus());
@@ -166,6 +172,7 @@
        orderDetailVO.setLatitude(shop.getLatitude());
        orderDetailVO.setShopId(shop.getId());
        orderDetailVO.setTechnicianName(technician.getName());
        orderDetailVO.setTechnicianSubscribeId(subscribe.getId());
        return orderDetailVO;
    }