From c5d38d650d2ac4101b1293a4f17346e7d5420076 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 04 七月 2025 20:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopRelUserServiceImpl.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopRelUserServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopRelUserServiceImpl.java
index 17ac6b0..693a979 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopRelUserServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopRelUserServiceImpl.java
@@ -3,10 +3,10 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.shop.domain.pojo.shop.ShopRelUser;
import com.ruoyi.shop.mapper.shop.ShopRelUserMapper;
import com.ruoyi.shop.service.shop.ShopRelUserService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -32,6 +32,16 @@
*/
@Override
public void deleteByShopId(Long shopId){
+ LambdaQueryWrapper<ShopRelUser> queryWrapper = Wrappers.lambdaQuery();
+ queryWrapper.eq(ShopRelUser::getDelFlag, 0).eq(ShopRelUser::getShopId, shopId);
+ List<ShopRelUser> shopRelUserList = this.list(queryWrapper);
+ if(shopRelUserList!=null&&!shopRelUserList.isEmpty()){
+ Long userId;
+ for(ShopRelUser shopRelUser : shopRelUserList){
+ userId = shopRelUser.getUserId();
+
+ }
+ }
shopRelUserMapper.deleteByShopId(shopId);
}
@@ -49,15 +59,14 @@
/**
- *
* @param userId
* @return
*/
@Override
- public ShopRelUser getByUserId(Long userId){
+ public List<ShopRelUser> getByUserId(Long userId) {
LambdaQueryWrapper<ShopRelUser> queryWrapper = Wrappers.lambdaQuery();
queryWrapper.eq(ShopRelUser::getDelFlag, 0).eq(ShopRelUser::getUserId, userId);
- return this.getOne(queryWrapper,false);
+ return this.list(queryWrapper);
}
/**
@@ -72,4 +81,9 @@
updateWrapper.eq(ShopRelUser::getDelFlag,0);
this.update(updateWrapper);
}
+
+ @Override
+ public void setDefaultCloseByUserIdList(List<Long> openIdList) {
+ this.getBaseMapper().setDefaultCloseByUserIdList(openIdList);
+ }
}
--
Gitblit v1.7.1