From 685c1ab4e9698f4a1e0e942069ca8b3541502e3c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 14 一月 2025 10:50:09 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TechnicianSubscribeService.java | 7 +++++++
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsBargainPriceServiceImpl.java | 2 +-
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianSubscribeServiceImpl.java | 14 ++++++++++++--
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianSubscribeController.java | 12 ++++++++++++
4 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianSubscribeController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianSubscribeController.java
index b9745bc..772d722 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianSubscribeController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianSubscribeController.java
@@ -81,6 +81,18 @@
return R.ok();
}
+
+ /**
+ * 预约技师
+ */
+ @PostMapping("/switchingTechnician")
+ @ApiOperation(value = "切换技师", notes = "切换技师", tags = {"小程序-个人中心-门店管理-预约列表"})
+ public R<Void> switchingTechnician(@RequestBody TechnicianSubscribe technicianSubscribe) {
+ technicianSubscribeService.switchingTechnician(technicianSubscribe);
+ return R.ok();
+ }
+
+
/**
* 取消服务
*/
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TechnicianSubscribeService.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TechnicianSubscribeService.java
index 27f5bd2..cc6788a 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TechnicianSubscribeService.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TechnicianSubscribeService.java
@@ -34,6 +34,13 @@
/**
+ * 切換技師
+ * @param technicianSubscribe
+ */
+ void switchingTechnician(TechnicianSubscribe technicianSubscribe);
+
+
+ /**
* 定时修改到期状态
*/
void taskEditStstus();
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsBargainPriceServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsBargainPriceServiceImpl.java
index 19c09e7..bcb49ce 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsBargainPriceServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsBargainPriceServiceImpl.java
@@ -80,7 +80,7 @@
SysUser sysUser = sysUserClient.getSysUser(userid).getData();
GoodsBargainPrice bargainPrice = this.getOne(new LambdaQueryWrapper<GoodsBargainPrice>().eq(GoodsBargainPrice::getShopId, sysUser.getObjectId())
.eq(GoodsBargainPrice::getGoodsId, vo.getGoodsId()).eq(GoodsBargainPrice::getDelFlag, 0).last(" order by create_time desc limit 0, 1"));
- if(null != bargainPrice && 1 == bargainPrice.getAuditStatus()){
+ if(null != bargainPrice && 0 == bargainPrice.getAuditStatus()){
return R.fail("特价申请正在审核中");
}
bargainPrice = new GoodsBargainPrice();
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 40949b1..77729d9 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
@@ -41,8 +41,7 @@
@Resource
private RemoteOrderGoodsClient orderGoodsClient;
@Resource
- private RedisTemplate<String, String> redisTemplate;
-
+ private RedisTemplate redisTemplate;
@Resource
private AppUserClient appUserClient;
@@ -83,6 +82,7 @@
@Override
public void subscribe(TechnicianSubscribe subscribe) {
+
Long userId = SecurityUtils.getUserId();
subscribe.setAppUserId(userId);
subscribe.setStatus(TechnicianStatus.UNSUBSCRIBE.getCode());
@@ -97,6 +97,16 @@
}
+ @Override
+ public void switchingTechnician(TechnicianSubscribe technicianSubscribe) {
+ TechnicianSubscribe subscribe = this.getById(technicianSubscribe.getId());
+ if(subscribe.getTechnicianId().equals(technicianSubscribe.getTechnicianId())){
+ throw new RuntimeException("不能切换相同的技师");
+ }
+ subscribe.setTechnicianId(technicianSubscribe.getTechnicianId());
+
+ }
+
/**
* 定时修改到期状态
*/
--
Gitblit v1.7.1