BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 287a17a9ff268dfa069e5249f688186b162a9a8a

Authored by 芋道源码
Committed by Gitee
2 parents 8f9404f9 0753df68

!583 调整 获取用户积分记录 和 获取用户签到记录接口 配合前端用户详情页面 

Merge pull request !583 from 风狗/会员详情
Inline Side-by-side
Showing 4 changed files with 14 additions and 0 deletions
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/point/vo/recrod/MemberPointRecordPageReqVO.java
  View file @287a17a
@@ -15,6 +15,9 @@ public class MemberPointRecordPageReqVO extends PageParam { @@ -15,6 +15,9 @@ public class MemberPointRecordPageReqVO extends PageParam {
15 @Schema(description = "用户昵称", example = "张三") 15 @Schema(description = "用户昵称", example = "张三")
16 private String nickname; 16 private String nickname;
17 17
  18 + @Schema(description = "用户ID", example = "123")
  19 + private Long userId;
  20 +
18 @Schema(description = "业务类型", example = "1") 21 @Schema(description = "业务类型", example = "1")
19 private Integer bizType; 22 private Integer bizType;
20 23
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/signin/vo/record/MemberSignInRecordPageReqVO.java
  View file @287a17a
@@ -23,6 +23,9 @@ public class MemberSignInRecordPageReqVO extends PageParam { @@ -23,6 +23,9 @@ public class MemberSignInRecordPageReqVO extends PageParam {
23 @Schema(description = "第几天签到", example = "10") 23 @Schema(description = "第几天签到", example = "10")
24 private Integer day; 24 private Integer day;
25 25
  26 + @Schema(description = "用户ID", example = "123")
  27 + private Long userId;
  28 +
26 @Schema(description = "签到时间") 29 @Schema(description = "签到时间")
27 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) 30 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
28 private LocalDateTime[] createTime; 31 private LocalDateTime[] createTime;
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/point/MemberPointRecordServiceImpl.java
  View file @287a17a
@@ -6,6 +6,7 @@ import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO; @@ -6,6 +6,7 @@ import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
6 import cn.iocoder.yudao.module.member.controller.admin.point.vo.recrod.MemberPointRecordPageReqVO; 6 import cn.iocoder.yudao.module.member.controller.admin.point.vo.recrod.MemberPointRecordPageReqVO;
7 import cn.iocoder.yudao.module.member.dal.dataobject.point.MemberPointRecordDO; 7 import cn.iocoder.yudao.module.member.dal.dataobject.point.MemberPointRecordDO;
8 import cn.iocoder.yudao.module.member.dal.mysql.point.MemberPointRecordMapper; 8 import cn.iocoder.yudao.module.member.dal.mysql.point.MemberPointRecordMapper;
  9 +import com.google.common.collect.Sets;
9 import org.apache.commons.lang3.StringUtils; 10 import org.apache.commons.lang3.StringUtils;
10 import org.springframework.stereotype.Service; 11 import org.springframework.stereotype.Service;
11 import org.springframework.util.CollectionUtils; 12 import org.springframework.util.CollectionUtils;
@@ -45,6 +46,9 @@ public class MemberPointRecordServiceImpl implements MemberPointRecordService { @@ -45,6 +46,9 @@ public class MemberPointRecordServiceImpl implements MemberPointRecordService {
45 } 46 }
46 userIds = convertSet(users, MemberUserRespDTO::getId); 47 userIds = convertSet(users, MemberUserRespDTO::getId);
47 } 48 }
  49 + if (pageReqVO.getUserId() != null) {
  50 + userIds = Sets.newHashSet(pageReqVO.getUserId());
  51 + }
48 // 执行查询 52 // 执行查询
49 return recordMapper.selectPage(pageReqVO, userIds); 53 return recordMapper.selectPage(pageReqVO, userIds);
50 } 54 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordServiceImpl.java
  View file @287a17a
@@ -6,6 +6,7 @@ import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO; @@ -6,6 +6,7 @@ import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
6 import cn.iocoder.yudao.module.member.controller.admin.signin.vo.record.MemberSignInRecordPageReqVO; 6 import cn.iocoder.yudao.module.member.controller.admin.signin.vo.record.MemberSignInRecordPageReqVO;
7 import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInRecordDO; 7 import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInRecordDO;
8 import cn.iocoder.yudao.module.member.dal.mysql.signin.MemberSignInRecordMapper; 8 import cn.iocoder.yudao.module.member.dal.mysql.signin.MemberSignInRecordMapper;
  9 +import com.google.common.collect.Sets;
9 import org.apache.commons.lang3.StringUtils; 10 import org.apache.commons.lang3.StringUtils;
10 import org.springframework.stereotype.Service; 11 import org.springframework.stereotype.Service;
11 import org.springframework.util.CollectionUtils; 12 import org.springframework.util.CollectionUtils;
@@ -44,6 +45,9 @@ public class MemberSignInRecordServiceImpl implements MemberSignInRecordService @@ -44,6 +45,9 @@ public class MemberSignInRecordServiceImpl implements MemberSignInRecordService
44 } 45 }
45 userIds = convertSet(users, MemberUserRespDTO::getId); 46 userIds = convertSet(users, MemberUserRespDTO::getId);
46 } 47 }
  48 + if (pageReqVO.getUserId() != null) {
  49 + userIds = Sets.newHashSet(pageReqVO.getUserId());
  50 + }
47 // 分页查询 51 // 分页查询
48 return signInRecordMapper.selectPage(pageReqVO, userIds); 52 return signInRecordMapper.selectPage(pageReqVO, userIds);
49 } 53 }