BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 175d244dee2f99e553fce00d8967c35692005e2c

Authored by YunaiV
2 parents 5932e8e9 287a17a9

Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product

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 @175d244
... ... @@ -15,6 +15,9 @@ public class MemberPointRecordPageReqVO extends PageParam {
15 15 @Schema(description = "用户昵称", example = "张三")
16 16 private String nickname;
17 17  
  18 + @Schema(description = "用户ID", example = "123")
  19 + private Long userId;
  20 +
18 21 @Schema(description = "业务类型", example = "1")
19 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 @175d244
... ... @@ -23,6 +23,9 @@ public class MemberSignInRecordPageReqVO extends PageParam {
23 23 @Schema(description = "第几天签到", example = "10")
24 24 private Integer day;
25 25  
  26 + @Schema(description = "用户ID", example = "123")
  27 + private Long userId;
  28 +
26 29 @Schema(description = "签到时间")
27 30 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
28 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 @175d244
... ... @@ -7,6 +7,7 @@ import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
7 7 import cn.iocoder.yudao.module.member.controller.admin.point.vo.recrod.MemberPointRecordPageReqVO;
8 8 import cn.iocoder.yudao.module.member.dal.dataobject.point.MemberPointRecordDO;
9 9 import cn.iocoder.yudao.module.member.dal.mysql.point.MemberPointRecordMapper;
  10 +import com.google.common.collect.Sets;
10 11 import org.apache.commons.lang3.StringUtils;
11 12 import org.springframework.stereotype.Service;
12 13 import org.springframework.util.CollectionUtils;
... ... @@ -46,6 +47,9 @@ public class MemberPointRecordServiceImpl implements MemberPointRecordService {
46 47 }
47 48 userIds = convertSet(users, MemberUserRespDTO::getId);
48 49 }
  50 + if (pageReqVO.getUserId() != null) {
  51 + userIds = Sets.newHashSet(pageReqVO.getUserId());
  52 + }
49 53 // 执行查询
50 54 return recordMapper.selectPage(pageReqVO, userIds);
51 55 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordServiceImpl.java
  View file @175d244
... ... @@ -8,6 +8,7 @@ import cn.iocoder.yudao.module.member.controller.admin.signin.vo.record.MemberSi
8 8 import cn.iocoder.yudao.module.member.controller.app.signin.vo.record.AppMemberSignInRecordRespVO;
9 9 import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInRecordDO;
10 10 import cn.iocoder.yudao.module.member.dal.mysql.signin.MemberSignInRecordMapper;
  11 +import com.google.common.collect.Sets;
11 12 import org.apache.commons.lang3.StringUtils;
12 13 import org.springframework.stereotype.Service;
13 14 import org.springframework.util.CollectionUtils;
... ... @@ -46,6 +47,9 @@ public class MemberSignInRecordServiceImpl implements MemberSignInRecordService
46 47 }
47 48 userIds = convertSet(users, MemberUserRespDTO::getId);
48 49 }
  50 + if (pageReqVO.getUserId() != null) {
  51 + userIds = Sets.newHashSet(pageReqVO.getUserId());
  52 + }
49 53 // 分页查询
50 54 return signInRecordMapper.selectPage(pageReqVO, userIds);
51 55 }
... ...