Commit d4a891e6c496d67ca828f4dd849e0c0d6027af41

Authored by xiaqing
1 parent 0907ca20

新增两个APP端接口

1.获取用户个人签到信息
2.用户签到接接口
yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
@@ -39,6 +39,7 @@ public interface ErrorCodeConstants { @@ -39,6 +39,7 @@ public interface ErrorCodeConstants {
39 ErrorCode SIGN_IN_CONFIG_EXISTS = new ErrorCode(1004009001, "签到天数规则已存在"); 39 ErrorCode SIGN_IN_CONFIG_EXISTS = new ErrorCode(1004009001, "签到天数规则已存在");
40 40
41 //========== 签到配置 1004010000 ========== 41 //========== 签到配置 1004010000 ==========
  42 + ErrorCode SIGN_IN_RECORD_EXISTS = new ErrorCode(1004010000,"用户重复签到");
42 43
43 44
44 //========== 用户等级 1004011000 ========== 45 //========== 用户等级 1004011000 ==========
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/signin/MemberSignInRecordConvert.java
@@ -5,7 +5,6 @@ import cn.iocoder.yudao.framework.common.util.collection.MapUtils; @@ -5,7 +5,6 @@ import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
5 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO; 5 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
6 import cn.iocoder.yudao.module.member.controller.admin.signin.vo.record.MemberSignInRecordRespVO; 6 import cn.iocoder.yudao.module.member.controller.admin.signin.vo.record.MemberSignInRecordRespVO;
7 import cn.iocoder.yudao.module.member.controller.app.signin.vo.record.AppMemberSignInRecordRespVO; 7 import cn.iocoder.yudao.module.member.controller.app.signin.vo.record.AppMemberSignInRecordRespVO;
8 -import cn.iocoder.yudao.module.member.controller.app.signin.vo.AppMemberSignInRecordRespVO;  
9 import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInRecordDO; 8 import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInRecordDO;
10 import org.mapstruct.Mapper; 9 import org.mapstruct.Mapper;
11 import org.mapstruct.factory.Mappers; 10 import org.mapstruct.factory.Mappers;
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/signin/MemberSignInConfigMapper.java
@@ -4,6 +4,8 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; @@ -4,6 +4,8 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
4 import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInConfigDO; 4 import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInConfigDO;
5 import org.apache.ibatis.annotations.Mapper; 5 import org.apache.ibatis.annotations.Mapper;
6 6
  7 +import java.util.List;
  8 +
7 /** 9 /**
8 * 签到规则 Mapper 10 * 签到规则 Mapper
9 * 11 *
@@ -16,7 +18,7 @@ public interface MemberSignInConfigMapper extends BaseMapperX<MemberSignInConfig @@ -16,7 +18,7 @@ public interface MemberSignInConfigMapper extends BaseMapperX<MemberSignInConfig
16 return selectOne(MemberSignInConfigDO::getDay, day); 18 return selectOne(MemberSignInConfigDO::getDay, day);
17 } 19 }
18 20
19 - default List<MemberSignInConfigDO> selectListByStatus(Integer status) { 21 + default List <MemberSignInConfigDO> selectListByStatus(Integer status) {
20 return selectList(MemberSignInConfigDO::getStatus, status); 22 return selectList(MemberSignInConfigDO::getStatus, status);
21 } 23 }
22 } 24 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordServiceImpl.java
1 package cn.iocoder.yudao.module.member.service.signin; 1 package cn.iocoder.yudao.module.member.service.signin;
2 2
  3 +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
3 import cn.iocoder.yudao.framework.common.pojo.PageParam; 4 import cn.iocoder.yudao.framework.common.pojo.PageParam;
4 import cn.iocoder.yudao.framework.common.pojo.PageResult; 5 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; 6 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
@@ -37,7 +38,7 @@ public class MemberSignInRecordServiceImpl implements MemberSignInRecordService @@ -37,7 +38,7 @@ public class MemberSignInRecordServiceImpl implements MemberSignInRecordService
37 38
38 @Resource 39 @Resource
39 private MemberSignInRecordMapper memberSignInRecordMapper; 40 private MemberSignInRecordMapper memberSignInRecordMapper;
40 - 41 + @Resource
41 private MemberSignInRecordMapper signInRecordMapper; 42 private MemberSignInRecordMapper signInRecordMapper;
42 @Resource 43 @Resource
43 private MemberSignInConfigMapper signInConfigMapper; 44 private MemberSignInConfigMapper signInConfigMapper;
@@ -134,7 +135,7 @@ public class MemberSignInRecordServiceImpl implements MemberSignInRecordService @@ -134,7 +135,7 @@ public class MemberSignInRecordServiceImpl implements MemberSignInRecordService
134 /**2.获取签到对应的分数**/ 135 /**2.获取签到对应的分数**/
135 //获取所有的签到规则,按照天数排序,只获取启用的 136 //获取所有的签到规则,按照天数排序,只获取启用的
136 List <MemberSignInConfigDO> configDOList = signInConfigMapper.selectList(new LambdaQueryWrapperX <MemberSignInConfigDO>() 137 List <MemberSignInConfigDO> configDOList = signInConfigMapper.selectList(new LambdaQueryWrapperX <MemberSignInConfigDO>()
137 - .eq(MemberSignInConfigDO::getEnable, 1) 138 + .eq(MemberSignInConfigDO::getStatus, CommonStatusEnum.ENABLE.getStatus())
138 .orderByAsc(MemberSignInConfigDO::getDay)); 139 .orderByAsc(MemberSignInConfigDO::getDay));
139 //如果签到的天数大于最大启用的规则天数,直接给最大签到的分数 140 //如果签到的天数大于最大启用的规则天数,直接给最大签到的分数
140 MemberSignInConfigDO lastConfig = configDOList.get(configDOList.size() - 1); 141 MemberSignInConfigDO lastConfig = configDOList.get(configDOList.size() - 1);