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

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/point/vo/recrod/MemberPointRecordPageReqVO.java

@@ -15,6 +15,9 @@ public class MemberPointRecordPageReqVO extends PageParam {
     @Schema(description = "用户昵称", example = "张三")
     private String nickname;
 
+    @Schema(description = "用户ID", example = "123")
+    private Long userId;
+
     @Schema(description = "业务类型", example = "1")
     private Integer bizType;
 

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/signin/vo/record/MemberSignInRecordPageReqVO.java

@@ -23,6 +23,9 @@ public class MemberSignInRecordPageReqVO extends PageParam {
     @Schema(description = "第几天签到", example = "10")
     private Integer day;
 
+    @Schema(description = "用户ID", example = "123")
+    private Long userId;
+
     @Schema(description = "签到时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/point/MemberPointRecordServiceImpl.java

@@ -7,6 +7,7 @@ import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
 import cn.iocoder.yudao.module.member.controller.admin.point.vo.recrod.MemberPointRecordPageReqVO;
 import cn.iocoder.yudao.module.member.dal.dataobject.point.MemberPointRecordDO;
 import cn.iocoder.yudao.module.member.dal.mysql.point.MemberPointRecordMapper;
+import com.google.common.collect.Sets;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -46,6 +47,9 @@ public class MemberPointRecordServiceImpl implements MemberPointRecordService {
             }
             userIds = convertSet(users, MemberUserRespDTO::getId);
         }
+        if (pageReqVO.getUserId() != null) {
+            userIds = Sets.newHashSet(pageReqVO.getUserId());
+        }
         // 执行查询
         return recordMapper.selectPage(pageReqVO, userIds);
     }

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordServiceImpl.java

@@ -8,6 +8,7 @@ import cn.iocoder.yudao.module.member.controller.admin.signin.vo.record.MemberSi
 import cn.iocoder.yudao.module.member.controller.app.signin.vo.record.AppMemberSignInRecordRespVO;
 import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInRecordDO;
 import cn.iocoder.yudao.module.member.dal.mysql.signin.MemberSignInRecordMapper;
+import com.google.common.collect.Sets;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -46,6 +47,9 @@ public class MemberSignInRecordServiceImpl implements MemberSignInRecordService
             }
             userIds = convertSet(users, MemberUserRespDTO::getId);
         }
+        if (pageReqVO.getUserId() != null) {
+            userIds = Sets.newHashSet(pageReqVO.getUserId());
+        }
         // 分页查询
         return signInRecordMapper.selectPage(pageReqVO, userIds);
     }