BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 60875a0472acf0102a03b0fe2e642bcbcbb402c7

Authored by YunaiV
1 parent 175d244d

code review：获取用户积分记录 接口增加对userId 的支持,获取用户签到记录接口增加对userId的支持

Inline Side-by-side
Showing 6 changed files with 4 additions and 11 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 @60875a0
... ... @@ -15,7 +15,7 @@ public class MemberPointRecordPageReqVO extends PageParam {
15 15 @Schema(description = "用户昵称", example = "张三")
16 16 private String nickname;
17 17  
18   - @Schema(description = "用户ID", example = "123")
  18 + @Schema(description = "用户编号", example = "123")
19 19 private Long userId;
20 20  
21 21 @Schema(description = "业务类型", example = "1")
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/signin/vo/record/MemberSignInRecordPageReqVO.java
  View file @60875a0
... ... @@ -23,7 +23,7 @@ public class MemberSignInRecordPageReqVO extends PageParam {
23 23 @Schema(description = "第几天签到", example = "10")
24 24 private Integer day;
25 25  
26   - @Schema(description = "用户ID", example = "123")
  26 + @Schema(description = "用户编号", example = "123")
27 27 private Long userId;
28 28  
29 29 @Schema(description = "签到时间")
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/point/MemberPointRecordMapper.java
  View file @60875a0
... ... @@ -21,6 +21,7 @@ public interface MemberPointRecordMapper extends BaseMapperX<MemberPointRecordDO
21 21 default PageResult<MemberPointRecordDO> selectPage(MemberPointRecordPageReqVO reqVO, Set<Long> userIds) {
22 22 return selectPage(reqVO, new LambdaQueryWrapperX<MemberPointRecordDO>()
23 23 .inIfPresent(MemberPointRecordDO::getUserId, userIds)
  24 + .eqIfPresent(MemberPointRecordDO::getUserId, reqVO.getUserId())
24 25 .eqIfPresent(MemberPointRecordDO::getBizType, reqVO.getBizType())
25 26 .likeIfPresent(MemberPointRecordDO::getTitle, reqVO.getTitle())
26 27 .orderByDesc(MemberPointRecordDO::getId));
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/signin/MemberSignInRecordMapper.java
  View file @60875a0
... ... @@ -21,6 +21,7 @@ public interface MemberSignInRecordMapper extends BaseMapperX&lt;MemberSignInRecord
21 21 default PageResult<MemberSignInRecordDO> selectPage(MemberSignInRecordPageReqVO reqVO, Set<Long> userIds) {
22 22 return selectPage(reqVO, new LambdaQueryWrapperX<MemberSignInRecordDO>()
23 23 .inIfPresent(MemberSignInRecordDO::getUserId, userIds)
  24 + .eqIfPresent(MemberSignInRecordDO::getUserId, reqVO.getUserId())
24 25 .eqIfPresent(MemberSignInRecordDO::getDay, reqVO.getDay())
25 26 .betweenIfPresent(MemberSignInRecordDO::getCreateTime, reqVO.getCreateTime())
26 27 .orderByDesc(MemberSignInRecordDO::getId));
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/point/MemberPointRecordServiceImpl.java
  View file @60875a0
... ... @@ -7,7 +7,6 @@ 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;
11 10 import org.apache.commons.lang3.StringUtils;
12 11 import org.springframework.stereotype.Service;
13 12 import org.springframework.util.CollectionUtils;
... ... @@ -47,9 +46,6 @@ public class MemberPointRecordServiceImpl implements MemberPointRecordService {
47 46 }
48 47 userIds = convertSet(users, MemberUserRespDTO::getId);
49 48 }
50   - if (pageReqVO.getUserId() != null) {
51   - userIds = Sets.newHashSet(pageReqVO.getUserId());
52   - }
53 49 // 执行查询
54 50 return recordMapper.selectPage(pageReqVO, userIds);
55 51 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordServiceImpl.java
  View file @60875a0
... ... @@ -5,10 +5,8 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
5 5 import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
6 6 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
7 7 import cn.iocoder.yudao.module.member.controller.admin.signin.vo.record.MemberSignInRecordPageReqVO;
8   -import cn.iocoder.yudao.module.member.controller.app.signin.vo.record.AppMemberSignInRecordRespVO;
9 8 import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInRecordDO;
10 9 import cn.iocoder.yudao.module.member.dal.mysql.signin.MemberSignInRecordMapper;
11   -import com.google.common.collect.Sets;
12 10 import org.apache.commons.lang3.StringUtils;
13 11 import org.springframework.stereotype.Service;
14 12 import org.springframework.util.CollectionUtils;
... ... @@ -47,9 +45,6 @@ public class MemberSignInRecordServiceImpl implements MemberSignInRecordService
47 45 }
48 46 userIds = convertSet(users, MemberUserRespDTO::getId);
49 47 }
50   - if (pageReqVO.getUserId() != null) {
51   - userIds = Sets.newHashSet(pageReqVO.getUserId());
52   - }
53 48 // 分页查询
54 49 return signInRecordMapper.selectPage(pageReqVO, userIds);
55 50 }
... ...