From 13bf32fd3427b2571f718596fa2dc7227a92f0c0 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 10 十二月 2024 17:50:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 21 ---------------------
1 files changed, 0 insertions(+), 21 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index ddb3407..6a40224 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -142,12 +142,6 @@
}
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());
@@ -172,9 +166,6 @@
orderDetailVO.setLatitude(shop.getLatitude());
orderDetailVO.setShopId(shop.getId());
orderDetailVO.setTechnicianName(technician.getName());
- if(null != subscribe){
- orderDetailVO.setTechnicianSubscribeId(String.valueOf(subscribe.getId()));
- }
return orderDetailVO;
}
@@ -218,18 +209,6 @@
order.setOrderStatus(OrderStatus.COMPLETED.getCode());
orderMapper.updateById(order);
Integer orderType = order.getOrderType();
- if (orderType.equals(OrderType.SERVICE.getCode())){
- R<TechnicianSubscribe> subscribeR = technicianClient.getSubscribeByOrderId(order.getId());
- if (R.isError(subscribeR)){
- throw new ServiceException("获取预约信息失败");
- }
- TechnicianSubscribe subscribe = subscribeR.getData();
- subscribe.setStatus(2);
- R<Void> r = technicianClient.updateStatus(subscribe.getStatus(), subscribe.getId());
- if (R.isError(r)){
- throw new ServiceException("更新预约状态失败");
- }
- }
// 售后设置
R<BaseSetting> baseSettingR = baseSettingClient.getBaseSetting(5);
--
Gitblit v1.7.1