BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 1bb2010dc0ed73b1bf8fc8d936a11ee72222927e

Authored by puhui999
1 parent 2f7371b4

签到记录：完善 review 提到的问题

Inline Side-by-side
Showing 6 changed files with 7 additions and 96 deletions
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/signin/AppMemberSignInController.java deleted
View file @2f7371b
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.module.member.service.signin.MemberSignInRecordService;
5   -import io.swagger.v3.oas.annotations.Operation;
6   -import io.swagger.v3.oas.annotations.tags.Tag;
7   -import org.springframework.web.bind.annotation.GetMapping;
8   -import org.springframework.web.bind.annotation.RequestMapping;
9   -import org.springframework.web.bind.annotation.RestController;
10   -
11   -import javax.annotation.Resource;
12   -
13   -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
14   -import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
15   -
16   -// TODO @xiaqing：sign-in
17   -@Tag(name = "签到APP - 签到")
18   -@RestController
19   -@RequestMapping("/member/signin")
20   -public class AppMemberSignInController {
21   -
22   - @Resource
23   - private MemberSignInRecordService signInRecordService;
24   -
25   - // TODO @xiaqing：泛型：
26   - // TODO @xiaqing：合并到 AppMemberSignInRecordController 的 getSignInRecordSummary 里哈。
27   - @Operation(summary = "个人签到信息")
28   - @GetMapping("/get-summary")
29   - public CommonResult getUserSummary() {
30   - return success(signInRecordService.getSignInRecordSummary(getLoginUserId()));
31   - }
32   -
33   -}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/signin/AppMemberSignInRecordController.java
  View file @1bb2010
... ... @@ -31,22 +31,11 @@ public class AppMemberSignInRecordController {
31 31 @Resource
32 32 private MemberSignInRecordService signInRecordService;
33 33  
34   - // TODO 芋艿：临时 mock => UserSignController.getUserInfo
35 34 @GetMapping("/get-summary")
36 35 @Operation(summary = "获得个人签到统计")
37 36 @PreAuthenticated
38 37 public CommonResult<AppMemberSignInRecordSummaryRespVO> getSignInRecordSummary() {
39   - AppMemberSignInRecordSummaryRespVO respVO = new AppMemberSignInRecordSummaryRespVO();
40   - if (false) {
41   - respVO.setTotalDay(100);
42   - respVO.setContinuousDay(5);
43   - respVO.setTodaySignIn(true);
44   - } else {
45   - respVO.setTotalDay(100);
46   - respVO.setContinuousDay(10);
47   - respVO.setTodaySignIn(false);
48   - }
49   - return success(respVO);
  38 + return success(signInRecordService.getSignInRecordSummary(getLoginUserId()));
50 39 }
51 40  
52 41 @PostMapping("/create")
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/signin/vo/AppMemberSignInRecordRespVO.java deleted
View file @2f7371b
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, example = "10")
19   - private Integer experience;
20   -
21   - @Schema(description = "签到时间", requiredMode = Schema.RequiredMode.REQUIRED)
22   - private LocalDateTime createTime;
23   -
24   -}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/signin/vo/AppMemberSignInSummaryRespVO.java deleted
View file @2f7371b
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/service/signin/MemberSignInRecordService.java
  View file @1bb2010
... ... @@ -3,7 +3,7 @@ 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.AppMemberSignInSummaryRespVO;
  6 +import cn.iocoder.yudao.module.member.controller.app.signin.vo.record.AppMemberSignInRecordSummaryRespVO;
7 7 import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInRecordDO;
8 8  
9 9 /**
... ... @@ -24,7 +24,7 @@ public interface MemberSignInRecordService {
24 24 /**
25 25 * 【会员】获得签到记录分页
26 26 *
27   - * @param userId 用户编号
  27 + * @param userId 用户编号
28 28 * @param pageParam 分页查询
29 29 * @return 签到记录分页
30 30 */
... ... @@ -44,7 +44,7 @@ public interface MemberSignInRecordService {
44 44 * @param userId 用户编号
45 45 * @return 个人签到统计信息
46 46 */
47   - AppMemberSignInSummaryRespVO getSignInRecordSummary(Long userId);
  47 + AppMemberSignInRecordSummaryRespVO getSignInRecordSummary(Long userId);
48 48  
49 49  
50 50 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordServiceImpl.java
  View file @1bb2010
... ... @@ -10,7 +10,7 @@ import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
10 10 import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
11 11 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
12 12 import cn.iocoder.yudao.module.member.controller.admin.signin.vo.record.MemberSignInRecordPageReqVO;
13   -import cn.iocoder.yudao.module.member.controller.app.signin.vo.AppMemberSignInSummaryRespVO;
  13 +import cn.iocoder.yudao.module.member.controller.app.signin.vo.record.AppMemberSignInRecordSummaryRespVO;
14 14 import cn.iocoder.yudao.module.member.convert.signin.MemberSignInRecordConvert;
15 15 import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInConfigDO;
16 16 import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInRecordDO;
... ... @@ -56,9 +56,9 @@ public class MemberSignInRecordServiceImpl implements MemberSignInRecordService
56 56 private MemberUserApi memberUserApi;
57 57  
58 58 @Override
59   - public AppMemberSignInSummaryRespVO getSignInRecordSummary(Long userId) {
  59 + public AppMemberSignInRecordSummaryRespVO getSignInRecordSummary(Long userId) {
60 60 // 1. 初始化默认返回信息
61   - AppMemberSignInSummaryRespVO vo = new AppMemberSignInSummaryRespVO();
  61 + AppMemberSignInRecordSummaryRespVO vo = new AppMemberSignInRecordSummaryRespVO();
62 62 vo.setTotalDay(0);
63 63 vo.setContinuousDay(0);
64 64 vo.setTodaySignIn(false);
... ...