From 3ec572e2cb7adf7d33d2018b24c003d9ef18906a Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 12 十一月 2024 13:32:51 +0800
Subject: [PATCH] 代码提交
---
xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserController.java | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserController.java b/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserController.java
index e5f804e..611c8fe 100644
--- a/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserController.java
+++ b/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserController.java
@@ -122,6 +122,17 @@
private RemoteUserService remoteUserService;
@Resource
private NoticeRecordService noticeRecordService;
+ @GetMapping("/deleteBalance/{id}/{amount}")
+ public R deleteBalance(@PathVariable("id")String id,@PathVariable("amount")String amount) {
+ AppUser byId = appUserService.getById(id);
+ if (byId!=null){
+ BigDecimal subtract = byId.getBalance().subtract(new BigDecimal(amount));
+ if (subtract.compareTo(BigDecimal.ZERO)<0){
+ byId.setBalance(BigDecimal.ZERO);
+ }
+ }
+ return R.ok();
+ }
@GetMapping("/testNotice")
@ApiOperation(value = "测试通知", tags = "测试通知")
public R testNotice() {
@@ -954,6 +965,7 @@
}
courseLambdaQueryWrapper.in(AppUser::getId, collect);
}
+ courseLambdaQueryWrapper.isNotNull(AppUser::getCellPhone);
Page<AppUser> page = appUserService.page(new Page<>(courseDTO.getPageCurr(), courseDTO.getPageSize()), courseLambdaQueryWrapper);
if (CollUtils.isEmpty(page.getRecords())) {
return R.ok(PageDTO.empty(page));
@@ -1033,7 +1045,12 @@
throw new ServiceException("验证码不正确");
}
AppUser byId = appUserService.getById(userId);
-
+ AppUser one = appUserService.lambdaQuery().eq(AppUser::getCellPhone, phone)
+ .ne(AppUser::getId, userId)
+ .ne(AppUser::getUserStatus, 3).one();
+ if (one!=null){
+ return R.fail("当前手机号已被绑定");
+ }
byId.setCellPhone(phone);
boolean b = appUserService.updateById(byId);
return R.ok();
@@ -1330,7 +1347,7 @@
consecutiveDays++;
currentDate = currentDate.minusDays(1);
}
- appUserInfoVO.setToday(consecutiveDays);
+ appUserInfoVO.setContinuity(consecutiveDays);
AppUserTree list1 = appUserTreeService.lambdaQuery().eq(AppUserTree::getAppUserId, userId)
.eq(AppUserTree::getSowAgain,2)
.one();
@@ -1408,7 +1425,6 @@
currentDate = currentDate.minusDays(1);
}
appUser.setContinuity(consecutiveDays);
- appUser.setToday(consecutiveDays);
// 根据等级查询疗愈名称和图标
UserLevelSetting data = remoteBannerService.getIconNameByLevel(level).getData();
appUser.setLevelName(data.getLevelName());
@@ -1610,11 +1626,7 @@
@PostMapping("/saveUserAnswers")
@ApiOperation(value = "保存计划引导页用户的答案", tags = {"用户端-计划引导相关接口"})
public R<?> saveUserAnswers(@Validated @RequestBody UserAnswerDTO dto) {
- LoginUser loginUser = tokenService.getLoginUser();
- if (loginUser==null){
- return R.tokenError("登录失效");
- }
- Long userId = loginUser.getUserid();
+
appUserService.saveUserAnswers(dto);
return R.ok();
}
--
Gitblit v1.7.1