bugfix:黑名单联调bug修改

alien-entity/src/main/java/shop/alien/entity/store/vo/LifeBlacklistVo.java

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import shop.alien.entity.store.LifeBlacklist;
+import shop.alien.entity.store.StoreInfo;
 
 /**
  * @Author: fcw
@@ -29,4 +30,6 @@ public class LifeBlacklistVo extends LifeBlacklist {
     @ApiModelProperty(value = "用户头像")
     private String phoneId;
 
+    @ApiModelProperty(value = "店铺信息")
+    private StoreInfo storeInfo;
 }

alien-store/src/main/java/shop/alien/store/controller/LifeBlacklistController.java

@@ -57,11 +57,21 @@ public class LifeBlacklistController {
         }
     }
 
+    /**
+     * 根据用户ID查询拉黑列表
+     *
+     * @param userType 用户类型
+     * @param userId   用户ID
+     * @param type     查找类型 1-被拉黑商户列表 2-拉黑用户列表
+     * @return 拉黑列表
+     */
     @ApiOperation("拉黑列表")
     @ApiOperationSupport(order = 2)
     @GetMapping("/blackListByUserId")
-    public R<List<LifeBlacklistVo>> blackListByUserId(@RequestParam(value = "userType") String userType, @RequestParam(value = "userId") String userId) {
-        return R.data(lifeBlacklistService.blackListByUserId(userType, userId));
+    public R<List<LifeBlacklistVo>> blackListByUserId(@RequestParam(value = "userType") String userType,
+                                                      @RequestParam(value = "userId") String userId,
+                                                      @RequestParam(value = "type", defaultValue = "1") Integer type) {
+        return R.data(lifeBlacklistService.blackListByUserId(userType, userId, type));
     }
 
     @ApiOperation("是否为已拉黑")

alien-store/src/main/java/shop/alien/store/service/LifeBlacklistService.java

@@ -19,7 +19,15 @@ public interface LifeBlacklistService extends IService<LifeBlacklist> {
 
     int blackList(LifeBlacklist lifeBlacklist);
 
-    List<LifeBlacklistVo> blackListByUserId(String userType, String userId);
+    /**
+     * 根据用户ID查询拉黑列表
+     *
+     * @param userType 用户类型
+     * @param userId   用户ID
+     * @param type     查找类型
+     * @return 拉黑列表
+     */
+    List<LifeBlacklistVo> blackListByUserId(String userType, String userId, Integer type);
 
     Boolean isBlackListUser(LifeBlacklist lifeBlacklist);
 

alien-store/src/main/java/shop/alien/store/service/impl/LifeBlacklistServiceImpl.java

@@ -7,15 +7,9 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
-import shop.alien.entity.store.LifeBlacklist;
-import shop.alien.entity.store.LifeUser;
-import shop.alien.entity.store.StoreImg;
-import shop.alien.entity.store.StoreUser;
+import shop.alien.entity.store.*;
 import shop.alien.entity.store.vo.LifeBlacklistVo;
-import shop.alien.mapper.LifeBlacklistMapper;
-import shop.alien.mapper.LifeUserMapper;
-import shop.alien.mapper.StoreImgMapper;
-import shop.alien.mapper.StoreUserMapper;
+import shop.alien.mapper.*;
 import shop.alien.store.config.BaseRedisService;
 import shop.alien.store.service.LifeBlacklistService;
 import shop.alien.util.common.JwtUtil;
@@ -44,6 +38,7 @@ public class LifeBlacklistServiceImpl extends ServiceImpl<LifeBlacklistMapper, L
     private final LifeUserMapper lifeUserMapper;
     private final StoreImgMapper storeImgMapper;
     private final BaseRedisService baseRedisService;
+    private final StoreInfoMapper storeInfoMapper;
 
     @Override
     public int blackList(LifeBlacklist lifeBlacklist) {
@@ -88,11 +83,16 @@ public class LifeBlacklistServiceImpl extends ServiceImpl<LifeBlacklistMapper, L
     }
 
     @Override
-    public List<LifeBlacklistVo> blackListByUserId(String userType, String userId) {
+    public List<LifeBlacklistVo> blackListByUserId(String userType, String userId, Integer type) {
         List<LifeBlacklistVo> lifeBlacklistVos = new ArrayList<>();
         LambdaUpdateWrapper<LifeBlacklist> wrapper = new LambdaUpdateWrapper<>();
         wrapper.eq(LifeBlacklist::getBlockerId, userId);
         wrapper.eq(LifeBlacklist::getBlockerType, userType);
+        if (1 == type) {
+            wrapper.eq(LifeBlacklist::getBlockedType, "1");
+        } else if (2 == type) {
+            wrapper.eq(LifeBlacklist::getBlockedType, "2");
+        }
         List<LifeBlacklist> lifeBlacklists = lifeBlacklistMapper.selectList(wrapper);
 
         for (LifeBlacklist lifeBlacklist : lifeBlacklists) {
@@ -105,14 +105,14 @@ public class LifeBlacklistServiceImpl extends ServiceImpl<LifeBlacklistMapper, L
             if (lifeBlacklist.getBlockedId() != null && lifeBlacklist.getBlockedType() != null) {
                 if ("1".equals(lifeBlacklist.getBlockedType())) {
                     StoreUser storeUser = storeUserMapper.selectById(lifeBlacklist.getBlockedId());
+                    StoreInfo storeInfo = storeInfoMapper.selectById(storeUser.getStoreId());
+                    lifeBlacklist.setStoreInfo(storeInfo);
                     StoreImg storeImg = null;
                     if (storeUser != null) {
-                        storeImg = storeImgMapper.selectOne(new LambdaUpdateWrapper<StoreImg>().eq(StoreImg::getStoreId, storeUser.getStoreId()).eq(StoreImg::getImgType, 10));
-                    }
-                    if (storeUser != null) {
                         lifeBlacklist.setName(storeUser.getName());
                         lifeBlacklist.setPhoneId(storeUser.getPhone());
                         lifeBlacklist.setUserImage(storeUser.getHeadImg());
+                        storeImg = storeImgMapper.selectOne(new LambdaUpdateWrapper<StoreImg>().eq(StoreImg::getStoreId, storeUser.getStoreId()).eq(StoreImg::getImgType, 10));
                         if (storeImg != null) {
                             lifeBlacklist.setUserImage(storeImg.getImgUrl());
                         }