订单列表

ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/AdminUserController.java

@@ -81,7 +81,31 @@ public class AdminUserController {
 	}
 
 
+	@RequiresPermissionsDesc(menu = { "用户管理", " 用户详情" }, button = "查询")
+	@PostMapping("/findDetail")
+	public Result findDetail(@RequestBody SysUserRequestDto dto) {
+		logger.info("【请求开始】操作人:[" + AuthSupport.userName()+ "] 用户管理->用户详情,请求参数: {} ", JsonUtils.from(dto));
+		try {
+			return adminUserService.findDetail(dto);
+		} catch (Exception e) {
+			logger.error("用户管理->用户详情->查询 error:{]",e);
+		}
+		return Result.failed();
+	}
+
 
+
+	@RequiresPermissionsDesc(menu = { "用户管理", "用户详情列表" }, button = "查询")
+	@PostMapping("/findDetailList")
+	public Result findDetailList(@RequestBody SysUserRequestDto dto) {
+		logger.info("【请求开始】操作人:[" + AuthSupport.userName()+ "] 用户管理->用户详情列表,请求参数: {} ", JsonUtils.from(dto));
+		try {
+			return adminUserService.findDetailList(dto);
+		} catch (Exception e) {
+			logger.error("用户管理->用户详情列表->查询 error:{]",e);
+		}
+		return Result.failed();
+	}
 //	@RequiresPermissions("admin:user:findList")
 	@RequiresPermissionsDesc(menu = { "邀请码管理", "下拉框会员列表" }, button = "查询")
 	@PostMapping("/findList")

ch-admin-api/src/main/java/com/wwdz/ch/admin/entity/vo/ShareRecordVo.java

+package com.wwdz.ch.admin.entity.vo;
+
+import com.xxdxxs.entity.Entity;
+import lombok.Data;
+import java.util.Date;
+
+@Data
+public class ShareRecordVo implements Entity {
+
+    /**
+     * 分享类型
+     */
+    private Integer shareType;
+
+    private String shareTypeName;
+
+    /**
+     * 分享内容
+     */
+    private String shareContent;
+
+    /**
+     * 分享时间
+     */
+    private Date shareTime;
+}

ch-admin-api/src/main/java/com/wwdz/ch/admin/entity/vo/SysDistributionOrderVo.java

@@ -94,6 +94,21 @@ public class SysDistributionOrderVo implements Entity {
      */
     private String address;
 
+    /**
+     * 收件人名称
+     */
+    private String receiverName;
+
+    /**
+     * 收件人电话
+     */
+    private String receiverPhone;
+
+    /**
+     * 收件人收货地址
+     */
+    private String receiverAddress;
+
     /**
      * 快递公司编码
      */

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

@@ -2,8 +2,12 @@ package com.wwdz.ch.admin.impl;
 
 import com.alibaba.dubbo.config.annotation.Reference;
 import com.github.pagehelper.PageInfo;
+import com.wwdz.ch.admin.entity.vo.ShareRecordVo;
 import com.wwdz.ch.admin.service.AdminUserService;
+import com.wwdz.ch.core.consts.DistributionEnum;
+import com.wwdz.ch.core.consts.ShareTypeEnum;
 import com.wwdz.ch.core.consts.UserEnum;
+import com.wwdz.ch.core.type.PageSearchResult;
 import com.wwdz.ch.core.type.Result;
 import com.wwdz.ch.core.util.CacheUtil;
 import com.wwdz.ch.core.util.ConvertUtil;
@@ -12,13 +16,19 @@ 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.distribution.SupplierItemDao;
 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.domain.distribution.CollectionShareRecord;
+import com.wwdz.ch.db.domain.distribution.DistributorShareRecord;
+import com.wwdz.ch.db.domain.distribution.SupplierItem;
 import com.wwdz.ch.db.dto.request.FollowFansRecordRequestDto;
 import com.wwdz.ch.db.dto.request.SysUserRequestDto;
+import com.wwdz.ch.db.dto.request.distribution.CollectionShareRecordRequestDto;
+import com.wwdz.ch.db.dto.request.distribution.DistributorShareRecordRequestDto;
 import com.wwdz.mall.common.vo.response.CloudServerResponse;
 import com.wwdz.user.api.service.user.UserReadService;
 import com.xxdxxs.utils.EntityMapper;
@@ -58,6 +68,9 @@ public class AdminUserServiceImpl implements AdminUserService {
     @Autowired
     CacheUtil cacheUtil;
 
+    @Autowired
+    SupplierItemDao supplierItemDao;
+
     @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);
@@ -169,6 +182,7 @@ public class AdminUserServiceImpl implements AdminUserService {
                     followFansRecordRequestDto.setFollowerId(dto.getId());
                 }
                 List<FollowFansRecord> followFansRecordList = followFansRecordDao.findList(followFansRecordRequestDto);
+                PageInfo pageInfo = new PageInfo(followFansRecordList);
                 List<UserVo> userVoList = new ArrayList<>();
                 for (FollowFansRecord followFansRecord : followFansRecordList) {
                     UserVo userVo = new UserVo();
@@ -183,12 +197,62 @@ public class AdminUserServiceImpl implements AdminUserService {
                     userVo.setPhone(user.getMobile());
                     userVo.setCreateTime(user.getAddTime());
                     userVoList.add(userVo);
-                    return Result.success(userVoList);
+                    return Result.success(PageSearchResult.of(pageInfo, userVoList));
                 }
             } else if (dto.getListType() == 3) {
+                List<ShareRecordVo> shareRecordVoList = new ArrayList<>();
                 //分享列表
+                if (dto.getShareType() == 1 || dto.getShareType() == 2) {
+                    CollectionShareRecordRequestDto collectionShareRecordRequestDto = new CollectionShareRecordRequestDto();
+
+                    collectionShareRecordRequestDto.setSharerId(dto.getId());
+                    collectionShareRecordRequestDto.setPage(dto.getPage());
+                    collectionShareRecordRequestDto.setLimit(dto.getLimit());
+                    if (dto.getShareType() == ShareTypeEnum.COLLECTOR_ITEM.getCode()) {
+                        //用户藏品分享
+                        collectionShareRecordRequestDto.setType(DistributionEnum.CollectionShareTypeEnum.ITEM.getCode());
+                    } else if (dto.getShareType() == ShareTypeEnum.COLLECTOR_PAGE.getCode()) {
+                        //藏馆分享
+                        collectionShareRecordRequestDto.setType(DistributionEnum.CollectionShareTypeEnum.PAGE.getCode());
+                    }
+                    List<CollectionShareRecord> collectionShareRecordList = collectionShareRecordDao.find(collectionShareRecordRequestDto);
+                    PageInfo pageInfo = new PageInfo(collectionShareRecordList);
+                    for (CollectionShareRecord collectionShareRecord : collectionShareRecordList) {
+                        ShareRecordVo shareRecordVo = new ShareRecordVo();
+                        shareRecordVo.setShareType(dto.getShareType());
+                        shareRecordVo.setShareTypeName(ShareTypeEnum.getNameByCode(dto.getShareType()));
+                        long shareTargetId = collectionShareRecord.getShareTargetId();
+                        if (dto.getShareType() == ShareTypeEnum.COLLECTOR_ITEM.getCode()) {
+                            SupplierItem supplierItem = supplierItemDao.findById(shareTargetId);
+                            shareRecordVo.setShareContent(supplierItem.getName());
+                        } else {
+                            User user = userDao.queryById(shareTargetId);
+                            shareRecordVo.setShareContent(user.getNickname() + "的藏馆");
+                        }
+                        shareRecordVo.setShareTime(collectionShareRecord.getCreateTime());
+                        shareRecordVoList.add(shareRecordVo);
+                    }
+                    return Result.success(PageSearchResult.of(pageInfo, shareRecordVoList));
+                }  else {
+                    //平台商品分享
+                    DistributorShareRecordRequestDto distributorShareRecordRequestDto = new DistributorShareRecordRequestDto();
+                    distributorShareRecordRequestDto.setDistributorId(dto.getId());
+                    distributorShareRecordRequestDto.setPage(dto.getPage());
+                    distributorShareRecordRequestDto.setLimit(dto.getLimit());
+                    List<DistributorShareRecord> distributorShareRecordList = distributorShareRecordDao.findByDistributorId(distributorShareRecordRequestDto);
+                    PageInfo pageInfo = new PageInfo(distributorShareRecordList);
+                    for (DistributorShareRecord distributorShareRecord : distributorShareRecordList) {
+                        ShareRecordVo shareRecordVo = new ShareRecordVo();
+                        shareRecordVo.setShareType(dto.getShareType());
+                        shareRecordVo.setShareTypeName(ShareTypeEnum.getNameByCode(dto.getShareType()));
+                        SupplierItem supplierItem = supplierItemDao.findById(distributorShareRecord.getItemId());
+                        shareRecordVo.setShareContent(supplierItem.getName());
+                        shareRecordVo.setShareTime(distributorShareRecord.getCreateTime());
+                        shareRecordVoList.add(shareRecordVo);
+                    }
+                    return Result.success(PageSearchResult.of(pageInfo, shareRecordVoList));
+                }
             }
-            return Result.success();
         } catch (Exception e) {
             logger.info("查询用户详情列表error:{}", e);
         }

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

+package com.wwdz.ch.core.consts;
+
+public enum ShareTypeEnum {
+
+    COLLECTOR_ITEM(1, "藏家藏品"),
+    COLLECTOR_PAGE(2, "藏家藏馆"),
+    SYSTEM_ITEM(3, "平台藏品"),
+    ;
+
+    private Integer code;
+
+    private String name;
+
+    ShareTypeEnum(Integer code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+
+    public static String getNameByCode(int code) {
+        for (ShareTypeEnum shareTypeEnum : ShareTypeEnum.values()) {
+            if (code == shareTypeEnum.getCode()) {
+                return shareTypeEnum.getName();
+            }
+        }
+        return null;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public String getName() {
+        return name;
+    }
+}

ch-dao/src/main/java/com/wwdz/ch/db/impl/distribution/CollectionShareRecordDaoImpl.java

 package com.wwdz.ch.db.impl.distribution;
 
+import com.github.pagehelper.PageHelper;
 import com.wwdz.ch.db.dao.distribution.CollectionShareRecordDao;
+import com.wwdz.ch.db.domain.FollowFansRecord;
 import com.wwdz.ch.db.domain.distribution.CollectionShareRecord;
 import com.wwdz.ch.db.domain.distribution.CollectionShareRecordExample;
 import com.wwdz.ch.db.dto.request.distribution.CollectionShareRecordRequestDto;
 import com.wwdz.ch.db.mapper.distribution.CollectionShareRecordMapper;
+import com.xxdxxs.db.component.JdbcHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 import java.util.List;
@@ -22,7 +25,15 @@ public class CollectionShareRecordDaoImpl implements CollectionShareRecordDao {
 
     @Override
     public List<CollectionShareRecord> find(CollectionShareRecordRequestDto dto) {
-        return null;
+        CollectionShareRecordExample example = new CollectionShareRecordExample();
+        example.setDistinct(true);
+        CollectionShareRecordExample.Criteria criteria = example.createCriteria();
+        JdbcHelper.ifPresent(dto.getSharerId(), criteria::andSharerIdEqualTo);
+        JdbcHelper.ifPresent(dto.getType(), criteria::andTypeEqualTo);
+        criteria.andIsDeletedEqualTo(false);
+        example.setOrderByClause("update_time desc");
+        PageHelper.startPage(dto.getPage(), dto.getLimit());
+        return collectionShareRecordMapper.selectByExampleSelective(example, CollectionShareRecord.Column.shareTargetId, CollectionShareRecord.Column.createTime);
     }
 
     @Override

ch-dao/src/main/java/com/wwdz/ch/db/impl/distribution/DistributorShareRecordDaoImpl.java

@@ -75,8 +75,8 @@ public class DistributorShareRecordDaoImpl implements DistributorShareRecordDao
         DistributorShareRecordExample distributorShareRecordExample = new DistributorShareRecordExample();
         DistributorShareRecordExample.Criteria criteria = distributorShareRecordExample.createCriteria();
         criteria.andDistributorIdEqualTo(dto.getDistributorId());
+        JdbcHelper.ifPresent(dto.getType(), criteria::andTypeEqualTo);
         criteria.andEnabledEqualTo(true);
-        criteria.andTypeEqualTo(dto.getType());
         distributorShareRecordExample.setOrderByClause(" create_time desc");
         PageHelper.startPage(dto.getPage(), dto.getLimit());
         return distributorShareRecordMapper.selectByExample(distributorShareRecordExample);

ch-dao/src/main/resources/com/wwdz/ch/db/mapper/distribution/CollectionShareRecordMapper.xml

@@ -96,7 +96,7 @@
       @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     select
-    'true' as QUERYID,
+
     <if test="example.distinct">
       distinct
     </if>