BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 477342d32494d1ae85c7b7515915936593bc06a9

Authored by YunaiV
2 parents 080c32b9 d4a891e6

Merge branch 'feature/mall_product' of https://gitee.com/SummerQing/ruoyi-vue-pr… 

…o into feature/mall_product
Inline Side-by-side
Showing 10 changed files with 249 additions and 13 deletions
yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
  View file @477342d
... ... @@ -39,6 +39,7 @@ public interface ErrorCodeConstants {
39 39 ErrorCode SIGN_IN_CONFIG_EXISTS = new ErrorCode(1004009001, "签到天数规则已存在");
40 40  
41 41 //========== 签到配置 1004010000 ==========
  42 + ErrorCode SIGN_IN_RECORD_EXISTS = new ErrorCode(1004010000,"用户重复签到");
42 43  
43 44  
44 45 //========== 用户等级 1004011000 ==========
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/signin/AppMemberSignInController.java 0 → 100644
  View file @477342d
  1 +package cn.iocoder.yudao.module.member.controller.app.signin;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.CommonResult;
  4 +import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
  5 +import cn.iocoder.yudao.module.member.convert.signin.MemberSignInRecordConvert;
  6 +import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInRecordDO;
  7 +import cn.iocoder.yudao.module.member.service.signin.MemberSignInRecordService;
  8 +import io.swagger.v3.oas.annotations.Operation;
  9 +import io.swagger.v3.oas.annotations.tags.Tag;
  10 +import org.springframework.web.bind.annotation.GetMapping;
  11 +import org.springframework.web.bind.annotation.PostMapping;
  12 +import org.springframework.web.bind.annotation.RequestMapping;
  13 +import org.springframework.web.bind.annotation.RestController;
  14 +
  15 +import javax.annotation.Resource;
  16 +
  17 +/**
  18 + * 描述 :用户签到相关信息接口
  19 + * Author :xiaqing
  20 + * Date :2023-09-15 09:02
  21 + */
  22 +@Tag(name = "签到APP - 签到")
  23 +@RestController
  24 +@RequestMapping("/member/signin")
  25 +public class AppMemberSignInController {
  26 +
  27 + @Resource
  28 + MemberSignInRecordService signInRecordService;
  29 +
  30 + /**
  31 + * 描述 :获取个人签到信息
  32 + * Author :xiaqing
  33 + * Date :2023-09-15 12:56:47
  34 + */
  35 +
  36 + @Operation(summary = "个人签到信息")
  37 + @GetMapping("/get-summary")
  38 + public CommonResult getUserSummary(){
  39 + return CommonResult.success(signInRecordService.getUserSummary(SecurityFrameworkUtils.getLoginUserId()));
  40 + }
  41 +
  42 +
  43 + /**
  44 + * 描述 :用户签到
  45 + * Author :xiaqing
  46 + * Date :2023-09-15 09:20:58
  47 + */
  48 + @Operation(summary = "会员签到")
  49 + @PostMapping("/create")
  50 + public CommonResult create(){
  51 + MemberSignInRecordDO recordDO = signInRecordService.create(SecurityFrameworkUtils.getLoginUserId());
  52 + return CommonResult.success(MemberSignInRecordConvert.INSTANCE.coverRecordToAppRecordVo(recordDO));
  53 + }
  54 +
  55 +}
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/signin/vo/AppMemberSignInRecordRespVO.java 0 → 100644
  View file @477342d
  1 +package cn.iocoder.yudao.module.member.controller.app.signin.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +
  6 +import java.time.LocalDateTime;
  7 +
  8 +@Schema(description = "用户签到积分 Response VO")
  9 +@Data
  10 +public class AppMemberSignInRecordRespVO {
  11 +
  12 + @Schema(description = "第几天签到", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
  13 + private Integer day;
  14 +
  15 + @Schema(description = "签到的分数", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
  16 + private Integer point;
  17 +
  18 + @Schema(description = "签到时间", requiredMode = Schema.RequiredMode.REQUIRED)
  19 + private LocalDateTime createTime;
  20 +
  21 +}
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/signin/vo/AppMemberSignInSummaryRespVO.java 0 → 100644
  View file @477342d
  1 +package cn.iocoder.yudao.module.member.controller.app.signin.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +
  6 +import java.time.LocalDateTime;
  7 +
  8 +@Schema(description = "用户签到统计信息 Response VO")
  9 +@Data
  10 +public class AppMemberSignInSummaryRespVO {
  11 +
  12 + @Schema(description = "持续签到天数", requiredMode = Schema.RequiredMode.REQUIRED, example = "5")
  13 + private Integer continuousDay;
  14 +
  15 + @Schema(description = "总签到天数", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
  16 + private Integer totalDay;
  17 +
  18 + @Schema(description = "当天是否签到", requiredMode = Schema.RequiredMode.REQUIRED,example = "true")
  19 + private Boolean todaySignIn ;
  20 +
  21 +}
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/signin/MemberSignInRecordConvert.java
  View file @477342d
... ... @@ -36,4 +36,6 @@ public interface MemberSignInRecordConvert {
36 36  
37 37 PageResult<AppMemberSignInRecordRespVO> convertPage02(PageResult<MemberSignInRecordDO> pageResult);
38 38  
  39 + AppMemberSignInRecordRespVO coverRecordToAppRecordVo(MemberSignInRecordDO memberSignInRecordDO);
  40 +
39 41 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/signin/MemberSignInConfigMapper.java
  View file @477342d
... ... @@ -18,7 +18,7 @@ public interface MemberSignInConfigMapper extends BaseMapperX&lt;MemberSignInConfig
18 18 return selectOne(MemberSignInConfigDO::getDay, day);
19 19 }
20 20  
21   - default List<MemberSignInConfigDO> selectListByStatus(Integer status) {
  21 + default List <MemberSignInConfigDO> selectListByStatus(Integer status) {
22 22 return selectList(MemberSignInConfigDO::getStatus, status);
23 23 }
24 24 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/signin/MemberSignInRecordMapper.java
  View file @477342d
... ... @@ -8,6 +8,7 @@ import cn.iocoder.yudao.module.member.controller.admin.signin.vo.record.MemberSi
8 8 import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInRecordDO;
9 9 import org.apache.ibatis.annotations.Mapper;
10 10  
  11 +import java.util.List;
11 12 import java.util.Set;
12 13  
13 14 /**
... ... @@ -33,4 +34,12 @@ public interface MemberSignInRecordMapper extends BaseMapperX&lt;MemberSignInRecord
33 34 .orderByDesc(MemberSignInRecordDO::getId));
34 35 }
35 36  
  37 +
  38 + //获取用户的签到记录列表信息,根据签到时间倒序
  39 + default List<MemberSignInRecordDO> selectListByUserId(Long userId){
  40 + return selectList(new LambdaQueryWrapperX <MemberSignInRecordDO>()
  41 + .eq(MemberSignInRecordDO::getUserId, userId)
  42 + .orderByDesc(MemberSignInRecordDO::getCreateTime));
  43 + }
  44 +
36 45 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordService.java
  View file @477342d
... ... @@ -3,6 +3,8 @@ package cn.iocoder.yudao.module.member.service.signin;
3 3 import cn.iocoder.yudao.framework.common.pojo.PageParam;
4 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5 5 import cn.iocoder.yudao.module.member.controller.admin.signin.vo.record.MemberSignInRecordPageReqVO;
  6 +import cn.iocoder.yudao.module.member.controller.app.signin.vo.AppMemberSignInRecordRespVO;
  7 +import cn.iocoder.yudao.module.member.controller.app.signin.vo.AppMemberSignInSummaryRespVO;
6 8 import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInRecordDO;
7 9  
8 10 /**
... ... @@ -29,4 +31,18 @@ public interface MemberSignInRecordService {
29 31 */
30 32 PageResult<MemberSignInRecordDO> getSignRecordPage(Long userId, PageParam pageParam);
31 33  
  34 +
  35 + MemberSignInRecordDO create(Long userId);
  36 +
  37 + /**
  38 + *
  39 + *功能描述: 根据用户id获取个人签到信息
  40 + * @param userId
  41 + * @return
  42 + * @author xiaqing
  43 + * @date 2023-09-15 14:21:01
  44 + */
  45 + AppMemberSignInSummaryRespVO getUserSummary(Long userId);
  46 +
  47 +
32 48 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordServiceImpl.java
  View file @477342d
1 1 package cn.iocoder.yudao.module.member.service.signin;
2 2  
  3 +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
3 4 import cn.iocoder.yudao.framework.common.pojo.PageParam;
4 5 import cn.iocoder.yudao.framework.common.pojo.PageResult;
  6 +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
5 7 import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
6 8 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
7 9 import cn.iocoder.yudao.module.member.controller.admin.signin.vo.record.MemberSignInRecordPageReqVO;
  10 +import cn.iocoder.yudao.module.member.controller.app.signin.vo.AppMemberSignInSummaryRespVO;
  11 +import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInConfigDO;
8 12 import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInRecordDO;
  13 +import cn.iocoder.yudao.module.member.dal.mysql.signin.MemberSignInConfigMapper;
9 14 import cn.iocoder.yudao.module.member.dal.mysql.signin.MemberSignInRecordMapper;
  15 +import cn.iocoder.yudao.module.member.enums.ErrorCodeConstants;
10 16 import org.apache.commons.lang3.StringUtils;
11 17 import org.springframework.stereotype.Service;
12 18 import org.springframework.util.CollectionUtils;
13 19 import org.springframework.validation.annotation.Validated;
14 20  
15 21 import javax.annotation.Resource;
  22 +import java.time.LocalDate;
  23 +import java.time.temporal.ChronoUnit;
16 24 import java.util.List;
17 25 import java.util.Set;
18 26  
  27 +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
19 28 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
20 29  
21 30 /**
... ... @@ -29,16 +38,64 @@ public class MemberSignInRecordServiceImpl implements MemberSignInRecordService
29 38  
30 39 @Resource
31 40 private MemberSignInRecordMapper memberSignInRecordMapper;
32   -
  41 + @Resource
  42 + private MemberSignInRecordMapper signInRecordMapper;
  43 + @Resource
  44 + private MemberSignInConfigMapper signInConfigMapper;
33 45 @Resource
34 46 private MemberUserApi memberUserApi;
35 47  
  48 +
  49 + @Override
  50 + public AppMemberSignInSummaryRespVO getUserSummary(Long userId) {
  51 + AppMemberSignInSummaryRespVO vo = new AppMemberSignInSummaryRespVO();
  52 + vo.setTotalDay(0);
  53 + vo.setContinuousDay(0);
  54 + vo.setTodaySignIn(false);
  55 + //获取用户签到的记录，按照天数倒序获取
  56 + List <MemberSignInRecordDO> signInRecordDOList = signInRecordMapper.selectListByUserId(userId);
  57 + if(!CollectionUtils.isEmpty(signInRecordDOList)){
  58 + //设置总签到天数
  59 + vo.setTotalDay(signInRecordDOList.size());
  60 + //判断当天是否有签到复用校验方法
  61 + try {
  62 + validSignDay(signInRecordDOList.get(0));
  63 + vo.setTodaySignIn(false);
  64 + }catch (Exception e){
  65 + vo.setTodaySignIn(true);
  66 + }
  67 + //如果当天签到了则说明连续签到天数有意义，否则直接用默认值0
  68 + if(vo.getTodaySignIn()){
  69 + //下方计算连续签到从2天开始，此处直接设置一天连续签到
  70 + vo.setContinuousDay(1);
  71 + //判断连续签到天数
  72 + for (int i = 1; i < signInRecordDOList.size(); i++) {
  73 + //前一天减1等于当前天数则说明连续，继续循环
  74 + LocalDate cur = signInRecordDOList.get(i).getCreateTime().toLocalDate();
  75 + LocalDate pre = signInRecordDOList.get(i-1).getCreateTime().toLocalDate();
  76 + if(1==daysBetween(cur,pre)){
  77 + vo.setContinuousDay(i+1);
  78 + }else{
  79 + break;
  80 + }
  81 + }
  82 + }
  83 +
  84 +
  85 + }
  86 + return vo;
  87 + }
  88 +
  89 + private long daysBetween(LocalDate date1,LocalDate date2){
  90 + return ChronoUnit.DAYS.between(date1, date2);
  91 + }
  92 +
36 93 @Override
37   - public PageResult<MemberSignInRecordDO> getSignInRecordPage(MemberSignInRecordPageReqVO pageReqVO) {
38   - // 根据用户昵称查询出用户 ids
39   - Set<Long> userIds = null;
  94 + public PageResult <MemberSignInRecordDO> getSignInRecordPage(MemberSignInRecordPageReqVO pageReqVO) {
  95 + // 根据用户昵称查询出用户ids
  96 + Set <Long> userIds = null;
40 97 if (StringUtils.isNotBlank(pageReqVO.getNickname())) {
41   - List<MemberUserRespDTO> users = memberUserApi.getUserListByNickname(pageReqVO.getNickname());
  98 + List <MemberUserRespDTO> users = memberUserApi.getUserListByNickname(pageReqVO.getNickname());
42 99 // 如果查询用户结果为空直接返回无需继续查询
43 100 if (CollectionUtils.isEmpty(users)) {
44 101 return PageResult.empty();
... ... @@ -54,4 +111,58 @@ public class MemberSignInRecordServiceImpl implements MemberSignInRecordService
54 111 return memberSignInRecordMapper.selectPage(userId, pageParam);
55 112 }
56 113  
  114 + @Override
  115 + public MemberSignInRecordDO create(Long userId) {
  116 + //获取当前用户签到的最大天数
  117 + MemberSignInRecordDO maxSignDay = signInRecordMapper.selectOne(new LambdaQueryWrapperX <MemberSignInRecordDO>()
  118 + .eq(MemberSignInRecordDO::getUserId, userId)
  119 + .orderByDesc(MemberSignInRecordDO::getDay)
  120 + .last("limit 1"));
  121 + //判断是否重复签到
  122 + validSignDay(maxSignDay);
  123 +
  124 + /**1.查询出当前签到的天数**/
  125 + MemberSignInRecordDO sign = new MemberSignInRecordDO();
  126 + sign.setUserId(userId);
  127 + //设置签到初始化天数
  128 + sign.setDay(1);
  129 + //设置签到分数默认为0
  130 + sign.setPoint(0);
  131 + //如果不为空则修改当前签到对应的天数
  132 + if (maxSignDay != null) {
  133 + sign.setDay(maxSignDay.getDay() + 1);
  134 + }
  135 + /**2.获取签到对应的分数**/
  136 + //获取所有的签到规则，按照天数排序，只获取启用的
  137 + List <MemberSignInConfigDO> configDOList = signInConfigMapper.selectList(new LambdaQueryWrapperX <MemberSignInConfigDO>()
  138 + .eq(MemberSignInConfigDO::getStatus, CommonStatusEnum.ENABLE.getStatus())
  139 + .orderByAsc(MemberSignInConfigDO::getDay));
  140 + //如果签到的天数大于最大启用的规则天数，直接给最大签到的分数
  141 + MemberSignInConfigDO lastConfig = configDOList.get(configDOList.size() - 1);
  142 + if (sign.getDay() > lastConfig.getDay()) {
  143 + sign.setPoint(lastConfig.getPoint());
  144 + } else {
  145 + configDOList.forEach(el -> {
  146 + //循环匹配对应天数，设置对应分数
  147 + if (el.getDay() == sign.getDay()) {
  148 + sign.setPoint(el.getPoint());
  149 + }
  150 +
  151 + });
  152 + }
  153 +
  154 + //3.插入当前签到获取的分数
  155 + signInRecordMapper.insert(sign);
  156 + //4.返回给用户
  157 + return sign;
  158 + }
  159 +
  160 + void validSignDay(MemberSignInRecordDO signInRecordDO) {
  161 + if (signInRecordDO == null)
  162 + return;
  163 + LocalDate today = LocalDate.now();
  164 + if (today.equals(signInRecordDO.getCreateTime().toLocalDate())) {
  165 + throw exception(ErrorCodeConstants.SIGN_IN_RECORD_EXISTS);
  166 + }
  167 + }
57 168 }
... ...
yudao-server/src/main/resources/application-local.yaml
  View file @477342d
... ... @@ -44,31 +44,31 @@ spring:
44 44 primary: master
45 45 datasource:
46 46 master:
47   - name: ruoyi-vue-pro
48   - url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
  47 + name: mall
  48 + url: jdbc:mysql://10.211.55.5:3308/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
49 49 # url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例
50 50 # url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.master.name} # PostgreSQL 连接的示例
51 51 # url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例
52 52 # url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=${spring.datasource.dynamic.datasource.master.name} # SQLServer 连接的示例
53 53 username: root
54   - password: 123456
  54 + password: 1qaz!QAZ
55 55 # username: sa
56 56 # password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W
57 57 slave: # 模拟从库，可根据自己需要修改
58   - name: ruoyi-vue-pro
59   - url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
  58 + name: mall
  59 + url: jdbc:mysql://10.211.55.5:3308/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
60 60 # url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例
61 61 # url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.slave.name} # PostgreSQL 连接的示例
62 62 # url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例
63 63 # url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=${spring.datasource.dynamic.datasource.slave.name} # SQLServer 连接的示例
64 64 username: root
65   - password: 123456
  65 + password: 1qaz!QAZ
66 66 # username: sa
67 67 # password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W
68 68  
69 69 # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
70 70 redis:
71   - host: 127.0.0.1 # 地址
  71 + host: 10.211.55.5 # 地址
72 72 port: 6379 # 端口
73 73 database: 0 # 数据库索引
74 74 # password: dev # 密码，建议生产环境开启
... ...