From b22df417e0bc423c788b013feaad686531d69eed Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 08 一月 2025 09:51:37 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianSubscribeServiceImpl.java | 40 ++++++++++++++++++++++++++++++++--------
1 files changed, 32 insertions(+), 8 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 d8637d0..70aa04e 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,11 +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.account.api.feignClient.AppUserClient;
import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.order.feignClient.RemoteOrderGoodsClient;
import com.ruoyi.other.api.domain.TechnicianSubscribe;
@@ -46,22 +48,30 @@
@Override
- public List<TechnicianSubscribeVO> getTechnicianSubscribeByUserAndShop(Long shopId, Integer status) {
- List<TechnicianSubscribeVO> list = technicianSubscribeMapper.getTechnicianSubscribeByUserAndShop(shopId, status);
+ public PageInfo<TechnicianSubscribeVO> getTechnicianSubscribeByUserAndShop(Long shopId, Integer status, Integer pageCurr, Integer pageSize) {
+ PageInfo<TechnicianSubscribeVO> pageInfo = new PageInfo(pageCurr, pageSize);
+ List<TechnicianSubscribeVO> list = technicianSubscribeMapper.getTechnicianSubscribeByUserAndShop(pageInfo, shopId, status);
for (TechnicianSubscribeVO technicianSubscribeVO : list) {
- Long id = technicianSubscribeVO.getId();
+ String id = technicianSubscribeVO.getId();
TechnicianSubscribe technicianSubscribe = this.getById(id);
AppUser appUser = appUserClient.getAppUserById(technicianSubscribe.getAppUserId());
technicianSubscribeVO.setUserName(appUser.getName());
technicianSubscribeVO.setPhone(appUser.getPhone());
}
- return list;
+ return pageInfo.setRecords(list);
}
@Override
- public List<TechnicianSubscribeVO> getTechnicianSubscribeByUserAndShop1(Long shopId, Integer status ,String phone,
- String name,
- Integer serviceMode) {
- return technicianSubscribeMapper.getTechnicianSubscribeByUserAndShop1(shopId,status,phone,name,serviceMode);
+ public PageInfo<TechnicianSubscribeVO> getTechnicianSubscribeByUserAndShop1(Long shopId, Integer status , String phone,
+ String name,
+ Integer serviceMode, Integer pageCurr, Integer pageSize) {
+ PageInfo<TechnicianSubscribeVO> pageInfo = new PageInfo(pageCurr, pageSize);
+ List<TechnicianSubscribeVO> technicianSubscribeByUserAndShop1 = technicianSubscribeMapper.getTechnicianSubscribeByUserAndShop1(pageInfo, shopId, status, phone, name, serviceMode);
+ for (TechnicianSubscribeVO technicianSubscribeVO : technicianSubscribeByUserAndShop1) {
+ AppUser appUser = appUserClient.getAppUserById(technicianSubscribeVO.getAppUserId());
+ technicianSubscribeVO.setUserName(appUser.getName());
+ technicianSubscribeVO.setPhone(appUser.getPhone());
+ }
+ return pageInfo.setRecords(technicianSubscribeByUserAndShop1);
}
@Override
public IPage<TechnicianSubscribeVO> getTechnicianSubscribeByUser(Page<TechnicianSubscribe> page, Long userId, Integer status) {
@@ -83,4 +93,18 @@
long deadlineTimestamp = subscribeTime.atZone(ZoneId.systemDefault()).toEpochSecond();
redisTemplate.opsForZSet().add("delay_queue:subscribe", subscribe.getId().toString(), deadlineTimestamp);
}
+
+
+ /**
+ * 定时修改到期状态
+ */
+ @Override
+ public void taskEditStstus() {
+ List<TechnicianSubscribe> list = this.list(new LambdaQueryWrapper<TechnicianSubscribe>().eq(TechnicianSubscribe::getStatus, 0).eq(TechnicianSubscribe::getDelFlag, 0)
+ .lt(TechnicianSubscribe::getSubscribeTime, LocalDateTime.now()));
+ list.forEach(s->s.setStatus(3));
+ if(list.size() > 0){
+ this.updateBatchById(list);
+ }
+ }
}
--
Gitblit v1.7.1