From fb6eee80334ae23a2eca8c37baeef05e86c919ed Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 10 十二月 2024 17:09:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianSubscribeServiceImpl.java | 48 +++++++++++++++++++++++-------------------------
1 files changed, 23 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..2067116 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,13 @@
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.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;
@@ -31,34 +30,33 @@
@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);
+ public List<TechnicianSubscribeVO> getTechnicianSubscribeByUserAndShop(Long shopId, Integer status) {
+ return technicianSubscribeMapper.getTechnicianSubscribeByUserAndShop(shopId,status);
}
@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) {
+ if (StringUtils.isNotEmpty(subscribe.getIdStr())){
+ subscribe.setId(Long.parseLong(subscribe.getIdStr()));
+ technicianSubscribeMapper.updateById(subscribe);
+ }else {
+ Long userId = SecurityUtils.getUserId();
+ subscribe.setAppUserId(userId);
+ subscribe.setStatus(TechnicianStatus.UNSUBSCRIBE.getCode());
+ subscribe.setDelFlag(0);
+ subscribe.setCreateTime(LocalDateTime.now());
+ technicianSubscribeMapper.insert(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.getTechnicianId() != null){
+ orderGoodsClient.subscribe(subscribe.getOrderId(), subscribe.getTechnicianId());
+ }
}
}
--
Gitblit v1.7.1