From fd9ee9caa17d4d722532f6536d53ce40254fa722 Mon Sep 17 00:00:00 2001 From: phpcjl <phpcjl@gmail.com> Date: 星期一, 09 十二月 2024 18:02:02 +0800 Subject: [PATCH] 1. --- ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianSubscribeServiceImpl.java | 28 +++++++++++----------------- 1 files changed, 11 insertions(+), 17 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..a18d4f0 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,14 +1,12 @@ 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.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; @@ -31,27 +29,19 @@ @Resource private TechnicianSubscribeMapper technicianSubscribeMapper; @Resource - private TechnicianMapper technicianMapper; + private RemoteOrderGoodsClient orderGoodsClient; @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); + public IPage<TechnicianSubscribeVO> getTechnicianSubscribeByUser(Page<TechnicianSubscribe> page, Long userId, Integer status) { + return technicianSubscribeMapper.getTechnicianSubscribeByUser(page, 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 void subscribe(TechnicianSubscribe subscribe) { // 创建技师预约单 Long userId = SecurityUtils.getUserId(); subscribe.setAppUserId(userId); @@ -60,5 +50,9 @@ subscribe.setCreateTime(LocalDateTime.now()); technicianSubscribeMapper.insert(subscribe); + if (subscribe.getTechnicianId() != null){ + orderGoodsClient.subscribe(subscribe.getOrderId(), Math.toIntExact(subscribe.getId())); + } + } } -- Gitblit v1.7.1