From 64934df4bec0b1447b8835371213c5decefb1325 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 14 一月 2025 15:31:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 16 +++++-----------
1 files changed, 5 insertions(+), 11 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 4ac605c..65ac6cf 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
@@ -177,14 +177,6 @@
}
OrderDetailVO orderDetailVO = new OrderDetailVO();
orderDetailVO.setDistributionMode(order.getDistributionMode());
- 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();
- }
Shop shop = shopR.getData();
orderDetailVO.setId(order.getId());
orderDetailVO.setOrderStatus(order.getOrderStatus());
@@ -209,13 +201,14 @@
orderDetailVO.setLongitude(shop.getLongitude());
orderDetailVO.setLatitude(shop.getLatitude());
orderDetailVO.setShopId(shop.getId());
- orderDetailVO.setTechnicianName(technician.getName());
- orderDetailVO.setTechnicianId(technician.getId());
if(order.getOrderType() == 1){
List<TechnicianSubscribe> data = technicianSubscribeClient.getTechnicianSubscribeList(order.getId()).getData();
if(data.size() > 0){
Long id = data.get(0).getId();
orderDetailVO.setTechnicianSubscribeId(id.toString());
+ Technician technician = technicianClient.shopdetail(order.getTechnicianId()).getData();
+ orderDetailVO.setTechnicianName(technician.getName());
+ orderDetailVO.setTechnicianId(technician.getId());
}
}
// 生成核销码BASE64
@@ -258,7 +251,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void writeOff(String id,Integer shopId) {
+ public void writeOff(String id,Integer shopId, Integer technicianId) {
LoginUser loginUserApplet = tokenService.getLoginUserApplet();
Order order = orderMapper.selectById(id);
boolean check = check(order, shopId, loginUserApplet.getUserid());
@@ -283,6 +276,7 @@
order.setAfterSaleTime(LocalDateTime.now().plusDays(days));
order.setEndTime(LocalDateTime.now());
order.setCancellerAppUserId(loginUserApplet.getUserid());
+ order.setTechnicianId(technicianId);
orderMapper.updateById(order);
}
--
Gitblit v1.7.1