From a8d2cb07f6440dc54dc4005b0b06d5a47cb1517d Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期一, 16 十二月 2024 13:34:03 +0800 Subject: [PATCH] 12.16 --- ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianSubscribeServiceImpl.java | 48 ++++++++++++++++++++++++------------------------ 1 files changed, 24 insertions(+), 24 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 9ad9a10..50f8621 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,22 +1,22 @@ package com.ruoyi.other.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +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.core.utils.StringUtils; import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.other.api.domain.Technician; -import com.ruoyi.other.mapper.TechnicianMapper; -import com.ruoyi.other.mapper.TechnicianSubscribeMapper; +import com.ruoyi.order.feignClient.RemoteOrderGoodsClient; import com.ruoyi.other.api.domain.TechnicianSubscribe; +import com.ruoyi.other.enums.TechnicianStatus; +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 org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.time.LocalDateTime; +import java.time.ZoneId; import java.util.List; /** @@ -32,32 +32,32 @@ @Resource private TechnicianSubscribeMapper technicianSubscribeMapper; @Resource - private TechnicianMapper technicianMapper; + private RemoteOrderGoodsClient orderGoodsClient; + @Resource + private RedisTemplate<String, String> redisTemplate; @Override - public List<TechnicianSubscribeVO> getTechnicianSubscribeByUserAndShop(Long userId, Long shopId) { - return technicianSubscribeMapper.getTechnicianSubscribeByUserAndShop(userId, shopId); + public List<TechnicianSubscribeVO> getTechnicianSubscribeByUserAndShop(Long shopId, Integer status) { + return technicianSubscribeMapper.getTechnicianSubscribeByUserAndShop(shopId,status); + } + @Override + public IPage<TechnicianSubscribeVO> getTechnicianSubscribeByUser(Page<TechnicianSubscribe> page, Long userId, Integer status) { + return technicianSubscribeMapper.getTechnicianSubscribeByUser(page, userId, status); } @Override - @Transactional(rollbackFor = Exception.class) - public void subscribe(TechnicianSubscribe technicianSubscribe) { - Long technicianId = technicianSubscribe.getTechnicianId(); + public void subscribe(TechnicianSubscribe subscribe) { 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); - UpdateWrapper<Technician> updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("id", technicianId); - updateWrapper.eq("subscribe_status", 1); - updateWrapper.eq("status", 2); - updateWrapper.set("subscribe_status", 2); - updateWrapper.set("create_time", LocalDateTime.now()); - int update = technicianMapper.update(null, updateWrapper); - if (update == 0){ - throw new ServiceException("改技师已预约"); + 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