From c67297af61ab9d897adae96f7e199c72c16d764b Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 02 十二月 2024 18:05:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianSubscribeServiceImpl.java | 34 +++++++++++++++++++---------------
1 files changed, 19 insertions(+), 15 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 6fb0962..4c042e0 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
@@ -3,15 +3,16 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.exception.ServiceException;
+import com.ruoyi.common.redis.annotation.DistributedLock;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.other.api.domain.Technician;
+import com.ruoyi.other.api.domain.TechnicianSubscribe;
+import com.ruoyi.other.enums.TechnicianErrorCode;
+import com.ruoyi.other.enums.TechnicianStatus;
import com.ruoyi.other.mapper.TechnicianMapper;
import com.ruoyi.other.mapper.TechnicianSubscribeMapper;
-import com.ruoyi.other.api.domain.TechnicianSubscribe;
import com.ruoyi.other.service.TechnicianSubscribeService;
import com.ruoyi.other.vo.TechnicianSubscribeVO;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.time.LocalDateTime;
@@ -36,25 +37,28 @@
public List<TechnicianSubscribeVO> getTechnicianSubscribeByUserAndShop(Long userId, Long shopId) {
return technicianSubscribeMapper.getTechnicianSubscribeByUserAndShop(userId, shopId);
}
+ @Override
+ public List<TechnicianSubscribeVO> getTechnicianSubscribeByUser(Long userId, Integer status) {
+ return technicianSubscribeMapper.getTechnicianSubscribeByUser(userId, status);
+ }
@Override
- @Transactional(rollbackFor = Exception.class)
- public void subscribe(TechnicianSubscribe technicianSubscribe) {
- Long technicianId = technicianSubscribe.getTechnicianId();
- Technician technician = technicianMapper.selectOne(new LambdaQueryWrapper<Technician>()
- .eq(Technician::getId, technicianId)
- .eq(Technician::getStatus, 1)
- .eq(Technician::getSubscribeStatus, 1));
- if (null == technician) {
- throw new ServiceException("不满足预约条件");
+ @DistributedLock(lockNamePre = "#technician_subscribe_lock", lockNamePost = "#technicianId")
+ public void subscribe(TechnicianSubscribe subscribe, Long technicianId) {
+ Long count = technicianSubscribeMapper.selectCount(new LambdaQueryWrapper<TechnicianSubscribe>()
+ .eq(TechnicianSubscribe::getTechnicianId, technicianId)
+ .eq(TechnicianSubscribe::getSubscribeTime, subscribe.getSubscribeTime())
+ .eq(TechnicianSubscribe::getStatus, TechnicianStatus.UNSUBSCRIBE.getCode()));
+ if (count > 0) {
+ throw new ServiceException("当前时间段已被预约", TechnicianErrorCode.TECHNICIAN_ALREADY_SUBSCRIBED.getCode());
}
+ // 创建技师预约单
Long userId = SecurityUtils.getUserId();
- TechnicianSubscribe subscribe = new TechnicianSubscribe();
subscribe.setAppUserId(userId);
+ subscribe.setStatus(TechnicianStatus.UNSUBSCRIBE.getCode());
subscribe.setDelFlag(0);
subscribe.setCreateTime(LocalDateTime.now());
technicianSubscribeMapper.insert(subscribe);
- technician.setSubscribeStatus(2);
- technicianMapper.updateById(technician);
+
}
}
--
Gitblit v1.7.1