藏家权限2

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/AdminUserServiceImpl.java

@@ -5,14 +5,19 @@ import com.github.pagehelper.PageInfo;
 import com.wwdz.ch.admin.service.AdminUserService;
 import com.wwdz.ch.core.consts.UserEnum;
 import com.wwdz.ch.core.type.Result;
+import com.wwdz.ch.core.util.CacheUtil;
 import com.wwdz.ch.core.util.ConvertUtil;
 import com.wwdz.ch.db.dao.CollectorWhiteListDao;
 import com.wwdz.ch.db.dao.FollowFansRecordDao;
 import com.wwdz.ch.db.dao.UserDao;
+import com.wwdz.ch.db.dao.distribution.CollectionShareRecordDao;
+import com.wwdz.ch.db.dao.distribution.DistributorShareRecordDao;
 import com.wwdz.ch.db.dao.dts.DtsUserDao;
 import com.wwdz.ch.db.domain.CollectorWhiteList;
+import com.wwdz.ch.db.domain.FollowFansRecord;
 import com.wwdz.ch.db.domain.User;
 import com.wwdz.ch.db.domain.UserVo;
+import com.wwdz.ch.db.dto.request.FollowFansRecordRequestDto;
 import com.wwdz.ch.db.dto.request.SysUserRequestDto;
 import com.wwdz.mall.common.vo.response.CloudServerResponse;
 import com.wwdz.user.api.service.user.UserReadService;
@@ -44,6 +49,15 @@ public class AdminUserServiceImpl implements AdminUserService {
     @Autowired
     FollowFansRecordDao followFansRecordDao;
 
+    @Autowired
+    DistributorShareRecordDao distributorShareRecordDao;
+
+    @Autowired
+    CollectionShareRecordDao collectionShareRecordDao;
+
+    @Autowired
+    CacheUtil cacheUtil;
+
     @Override
     public Object findList(String username, String mobile, Integer page, Integer size, String sort, String order) {
         List<User> userList = dtsUserDao.querySelective(username, mobile, page, size, sort, order);
@@ -123,4 +137,61 @@ public class AdminUserServiceImpl implements AdminUserService {
         }
         return Result.failed();
     }
+
+
+    @Override
+    public Result findDetail(SysUserRequestDto dto) {
+        try {
+            User user = userDao.queryById(dto.getId());
+            UserVo userVo = new UserVo();
+            EntityMapper.copyAttribute(user, userVo);
+            userVo.setStatusName(UserEnum.StatusEnum.getNameByCode(user.getStatus()));
+            userVo.setUserLevelName(UserEnum.LevelEnum.getNameByCode(user.getUserLevel()));
+            return Result.success(userVo);
+        } catch (Exception e) {
+            logger.info("查询用户详情error:{}", e);
+        }
+        return Result.failed();
+    }
+
+    @Override
+    public Result findDetailList(SysUserRequestDto dto) {
+        try {
+            if (dto.getListType() == 1 || dto.getListType() == 2) {
+                FollowFansRecordRequestDto followFansRecordRequestDto = new FollowFansRecordRequestDto();
+                followFansRecordRequestDto.setPage(dto.getPage());
+                followFansRecordRequestDto.setLimit(dto.getLimit());
+                //关注列表
+                if (dto.getListType() == 1 ) {
+                    followFansRecordRequestDto.setFansId(dto.getId());
+                } else {
+                    //粉丝列表
+                    followFansRecordRequestDto.setFollowerId(dto.getId());
+                }
+                List<FollowFansRecord> followFansRecordList = followFansRecordDao.findList(followFansRecordRequestDto);
+                List<UserVo> userVoList = new ArrayList<>();
+                for (FollowFansRecord followFansRecord : followFansRecordList) {
+                    UserVo userVo = new UserVo();
+                    User user = new User();
+                    if (dto.getListType() == 1 ) {
+                        user = cacheUtil.appletUserInfoCache.get(followFansRecord.getFollowerId()).get();
+                    } else {
+                        user = cacheUtil.appletUserInfoCache.get(followFansRecord.getFansId()).get();
+                    }
+                    userVo.setId(user.getId());
+                    userVo.setNickname(user.getNickname());
+                    userVo.setPhone(user.getMobile());
+                    userVo.setCreateTime(user.getAddTime());
+                    userVoList.add(userVo);
+                    return Result.success(userVoList);
+                }
+            } else if (dto.getListType() == 3) {
+                //分享列表
+            }
+            return Result.success();
+        } catch (Exception e) {
+            logger.info("查询用户详情列表error:{}", e);
+        }
+        return Result.failed();
+    }
 }

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/SysSupplierItemServiceImpl.java

@@ -163,7 +163,7 @@ public class SysSupplierItemServiceImpl implements SysSupplierItemService {
                 supplierItemVo.setDistributionPrice(PriceUtil.convertPriceFenToYuan(supplierItem.getDistributionPrice()));
                 supplierItemVo.setHomePageImage(MediaUtil.getHomePageImage(supplierItem.getImages(), supplierItem.getVideos()));
                 supplierItemVo.setTypeName(DistributionEnum.DistributionTypeEnum.getNameByCode(supplierItem.getType()));
-                supplierItemVo.setCreatorName(cacheUtil.getAppletUserById(supplierItem.getCreatorId()).getNickname());
+                supplierItemVo.setCreatorName(supplierItem.getCreatorId() == CommConsts.SYSTEM_ACCOUNT.longValue()? "平台自营":cacheUtil.getAppletUserById(supplierItem.getCreatorId()).getNickname());
                 supplierItemVo.setStatusName(SupplierItemEnum.StatusEnum.getNameByCode(supplierItem.getStatus()));
                 if (supplierItem.getBuyLimitNum() == -1) {
                     supplierItemVo.setIsLimitBuy(false);

ch-admin-api/src/main/java/com/wwdz/ch/admin/service/AdminUserService.java

@@ -3,6 +3,7 @@ package com.wwdz.ch.admin.service;
 
 import com.wwdz.ch.core.type.Result;
 import com.wwdz.ch.db.domain.User;
+import com.wwdz.ch.db.domain.UserVo;
 import com.wwdz.ch.db.dto.request.SysUserRequestDto;
 
 import java.util.List;
@@ -29,4 +30,21 @@ public interface AdminUserService {
      */
     Result updateAccountState(SysUserRequestDto dto);
 
+    /**
+     * 用户详情
+     * @param dto
+     * @return
+     */
+    Result findDetail(SysUserRequestDto dto);
+
+    /**
+     * 关注列表
+     * 粉丝列表
+     * 分享列表
+     * @param dto
+     * @return
+     */
+    Result findDetailList(SysUserRequestDto dto);
+
+
 }

ch-core/src/main/java/com/wwdz/ch/core/consts/UserEnum.java

@@ -41,7 +41,7 @@ public class UserEnum {
 
 
     /**
-     * 账号状态
+     * 用户角色
      */
     public enum LevelEnum {
         COMMON(0, "普通用户"),
@@ -75,6 +75,5 @@ public class UserEnum {
         public String getDes() {
             return des;
         }
-
     }
 }

ch-dao/src/main/java/com/wwdz/ch/db/domain/UserVo.java

@@ -47,6 +47,8 @@ public class UserVo implements Entity {
 	 */
 	private Integer userLevel;
 
+	private String userLevelName;
+
 	/**
 	 * 用户昵称或网络名称
 	 */
@@ -97,11 +99,15 @@ public class UserVo implements Entity {
 	 */
 	private Integer status;
 
+	private String statusName;
+
 	/**
 	 * 创建时间
 	 */
 	private Date addTime;
 
+	private Date createTime;
+
 	/**
 	 * 更新时间
 	 */

ch-dao/src/main/java/com/wwdz/ch/db/dto/request/SysUserRequestDto.java

@@ -4,7 +4,7 @@ import com.xxdxxs.entity.Entity;
 import lombok.Data;
 
 @Data
-public class SysUserRequestDto implements Entity {
+public class SysUserRequestDto extends BaseRequestDto implements Entity {
     private Long id;
     private String mobile;
     private String nickname;
@@ -20,4 +20,20 @@ public class SysUserRequestDto implements Entity {
      * 0正常，1禁用
      */
     private Integer status;
+
+    /**
+     * 查询的列表类型
+     * 1关注列表
+     * 2粉丝列表
+     * 3分享列表
+     */
+    private Integer listType;
+
+    /**
+     * 分享列表中的分享类型
+     * 1藏家藏品
+     * 2藏馆
+     * 3平台商品
+     */
+    private Integer shareType;
 }