From 87a597dd71f67e05367169640f862bcef809e720 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 14 一月 2025 11:59:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianSubscribeServiceImpl.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianSubscribeServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianSubscribeServiceImpl.java
index 3fd7867..3bc5b95 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianSubscribeServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianSubscribeServiceImpl.java
@@ -98,12 +98,16 @@
@Override
public void switchingTechnician(TechnicianSubscribe technicianSubscribe) {
- TechnicianSubscribe subscribe = this.getById(technicianSubscribe.getId());
- if(subscribe.getTechnicianId().equals(technicianSubscribe.getTechnicianId())){
- throw new RuntimeException("不能切换相同的技师");
+ List<TechnicianSubscribe> list = this.list(new LambdaQueryWrapper<TechnicianSubscribe>().eq(TechnicianSubscribe::getOrderId, technicianSubscribe.getOrderId())
+ .eq(TechnicianSubscribe::getDelFlag, 0).eq(TechnicianSubscribe::getStatus, 0));
+ for (TechnicianSubscribe subscribe : list) {
+ if(subscribe.getTechnicianId().equals(technicianSubscribe.getTechnicianId())){
+ throw new RuntimeException("不能切换相同的技师");
+ }
+ subscribe.setTechnicianId(technicianSubscribe.getTechnicianId());
+ this.updateById(subscribe);
}
- subscribe.setTechnicianId(technicianSubscribe.getTechnicianId());
- this.updateById(subscribe);
+
}
/**
--
Gitblit v1.7.1