From a988a89e6b0cd75a5df4691eb8196c0ef9513a05 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 19:46:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianSubscribeServiceImpl.java | 72 +++++++++++++++++++++++------------
1 files changed, 47 insertions(+), 25 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 4c042e0..d8637d0 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
@@ -1,21 +1,24 @@
package com.ruoyi.other.service.impl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.account.api.feignClient.AppUserClient;
+import com.ruoyi.account.api.model.AppUser;
+import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.order.feignClient.RemoteOrderGoodsClient;
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.service.TechnicianSubscribeService;
import com.ruoyi.other.vo.TechnicianSubscribeVO;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.time.LocalDateTime;
+import java.time.ZoneId;
import java.util.List;
/**
@@ -31,34 +34,53 @@
@Resource
private TechnicianSubscribeMapper technicianSubscribeMapper;
@Resource
- private TechnicianMapper technicianMapper;
+ private RemoteOrderGoodsClient orderGoodsClient;
+ @Resource
+ private RedisTemplate<String, String> redisTemplate;
+
+ @Resource
+ private AppUserClient appUserClient;
+
+
+
+
@Override
- 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
- @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());
+ public List<TechnicianSubscribeVO> getTechnicianSubscribeByUserAndShop(Long shopId, Integer status) {
+ List<TechnicianSubscribeVO> list = technicianSubscribeMapper.getTechnicianSubscribeByUserAndShop(shopId, status);
+ for (TechnicianSubscribeVO technicianSubscribeVO : list) {
+ Long id = technicianSubscribeVO.getId();
+ TechnicianSubscribe technicianSubscribe = this.getById(id);
+ AppUser appUser = appUserClient.getAppUserById(technicianSubscribe.getAppUserId());
+ technicianSubscribeVO.setUserName(appUser.getName());
+ technicianSubscribeVO.setPhone(appUser.getPhone());
}
- // 创建技师预约单
+ return list;
+ }
+ @Override
+ public List<TechnicianSubscribeVO> getTechnicianSubscribeByUserAndShop1(Long shopId, Integer status ,String phone,
+ String name,
+ Integer serviceMode) {
+ return technicianSubscribeMapper.getTechnicianSubscribeByUserAndShop1(shopId,status,phone,name,serviceMode);
+ }
+ @Override
+ public IPage<TechnicianSubscribeVO> getTechnicianSubscribeByUser(Page<TechnicianSubscribe> page, Long userId, Integer status) {
+ return technicianSubscribeMapper.getTechnicianSubscribeByUser(page, userId, status);
+ }
+
+ @Override
+ public void subscribe(TechnicianSubscribe subscribe) {
Long userId = SecurityUtils.getUserId();
subscribe.setAppUserId(userId);
subscribe.setStatus(TechnicianStatus.UNSUBSCRIBE.getCode());
subscribe.setDelFlag(0);
subscribe.setCreateTime(LocalDateTime.now());
technicianSubscribeMapper.insert(subscribe);
-
+ if (subscribe.getOrderId() != null){
+ orderGoodsClient.subscribe(subscribe.getOrderId(), subscribe.getTechnicianId());
+ }
+ LocalDateTime subscribeTime = subscribe.getSubscribeTime();
+ long deadlineTimestamp = subscribeTime.atZone(ZoneId.systemDefault()).toEpochSecond();
+ redisTemplate.opsForZSet().add("delay_queue:subscribe", subscribe.getId().toString(), deadlineTimestamp);
}
}
--
Gitblit v1.7.1