From e93aad02d2dd2a6e624e81ea0adb3611a8fc43e5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 17:16:19 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianSubscribeServiceImpl.java | 56 ++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 40 insertions(+), 16 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 10f951e..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
@@ -3,6 +3,8 @@
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.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;
@@ -11,10 +13,12 @@
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,10 +35,33 @@
private TechnicianSubscribeMapper technicianSubscribeMapper;
@Resource
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);
+ 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) {
@@ -43,20 +70,17 @@
@Override
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.getOrderId() != null){
+ orderGoodsClient.subscribe(subscribe.getOrderId(), subscribe.getTechnicianId());
}
- if (subscribe.getTechnicianId() != null){
- orderGoodsClient.subscribe(subscribe.getOrderId(), Math.toIntExact(subscribe.getId()));
- }
-
+ 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