From 2b23ece9828267329ffc5c38dd96da8157897055 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 09 十一月 2024 17:32:13 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/XinQuanHealing
---
xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/controller/management/MgtOrderController.java | 12 ++++++------
xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserWithdrawController.java | 12 ++++++++++++
xinquan-auth/src/main/java/com/xinquan/auth/controller/TokenController.java | 7 +++++++
xinquan-common/xinquan-common-core/src/main/java/com/xinquan/common/core/constant/CacheConstants.java | 4 ++++
xinquan-auth/src/main/java/com/xinquan/auth/service/SysLoginService.java | 2 ++
5 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/xinquan-auth/src/main/java/com/xinquan/auth/controller/TokenController.java b/xinquan-auth/src/main/java/com/xinquan/auth/controller/TokenController.java
index 95e7ca1..66a9c00 100644
--- a/xinquan-auth/src/main/java/com/xinquan/auth/controller/TokenController.java
+++ b/xinquan-auth/src/main/java/com/xinquan/auth/controller/TokenController.java
@@ -28,6 +28,7 @@
import java.time.LocalDateTime;
import java.util.HashMap;
import java.util.List;
+import java.util.Objects;
import java.util.Set;
import javax.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.annotation.Autowired;
@@ -70,6 +71,12 @@
public R<?> sendCaptchaCode(
@RequestParam(value = "cellPhone", required = true) String cellPhone,
@RequestParam("type") Integer type) {
+ if(type == 3){
+ SysUser sysUser = userClient.queryUserByPhone(cellPhone).getData();
+ if(Objects.isNull(sysUser)){
+ return R.fail("该手机号未注册");
+ }
+ }
sysLoginService.sendCaptchaCode(cellPhone, type);
return R.ok();
}
diff --git a/xinquan-auth/src/main/java/com/xinquan/auth/service/SysLoginService.java b/xinquan-auth/src/main/java/com/xinquan/auth/service/SysLoginService.java
index 99ac720..fc9388b 100644
--- a/xinquan-auth/src/main/java/com/xinquan/auth/service/SysLoginService.java
+++ b/xinquan-auth/src/main/java/com/xinquan/auth/service/SysLoginService.java
@@ -274,6 +274,8 @@
return CacheConstants.APP_VERIFY_CAPTCHA_CODE_PREFIX;
case 5:
return CacheConstants.APP_CHANGE_PHONE_CODE_PREFIX;
+ case 6:
+ return CacheConstants.ADD_CARD_PHONE_CODE_PREFIX;
default:
return "";
}
diff --git a/xinquan-common/xinquan-common-core/src/main/java/com/xinquan/common/core/constant/CacheConstants.java b/xinquan-common/xinquan-common-core/src/main/java/com/xinquan/common/core/constant/CacheConstants.java
index e43efa2..362856a 100644
--- a/xinquan-common/xinquan-common-core/src/main/java/com/xinquan/common/core/constant/CacheConstants.java
+++ b/xinquan-common/xinquan-common-core/src/main/java/com/xinquan/common/core/constant/CacheConstants.java
@@ -82,6 +82,10 @@
*/
public static final String APP_CHANGE_PHONE_CODE_PREFIX = "app_change_phone_code:";
/**
+ * 添加银行卡 redis key
+ */
+ public static final String ADD_CARD_PHONE_CODE_PREFIX = "add_card_phone_code:";
+ /**
* APP第三方登录手机号校验验证码修改密码秘钥 redis key
*/
public static final String APP_PASSWORD_SECRET_PREFIX = "app_password_secret:";
diff --git a/xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/controller/management/MgtOrderController.java b/xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/controller/management/MgtOrderController.java
index 4677585..db07a27 100644
--- a/xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/controller/management/MgtOrderController.java
+++ b/xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/controller/management/MgtOrderController.java
@@ -373,8 +373,8 @@
String endTime = null;
if (org.springframework.util.StringUtils.hasLength(courseDTO.getTime())){
String[] split = courseDTO.getTime().split(" - ");
- startTime = split[0]+"00:00:00";
- endTime = split[1]+"23:59:59";
+ startTime = split[0]+" 00:00:00";
+ endTime = split[1]+" 23:59:59";
}
List<Integer> payType1 = new ArrayList<>();
payType1.add(1);
@@ -386,10 +386,10 @@
payType3.add(3);
payType3.add(7);
List<Integer> payType4 = new ArrayList<>();
- payType3.add(4);
- payType3.add(5);
- payType3.add(6);
- payType3.add(7);
+ payType4.add(4);
+ payType4.add(5);
+ payType4.add(6);
+ payType4.add(7);
LambdaQueryWrapper<Order> courseLambdaQueryWrapper = new LambdaQueryWrapper<>();
if (startTime!=null){
courseLambdaQueryWrapper.between(Order::getCreateTime, startTime, endTime);
diff --git a/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserWithdrawController.java b/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserWithdrawController.java
index 939a292..9e86fb2 100644
--- a/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserWithdrawController.java
+++ b/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserWithdrawController.java
@@ -6,11 +6,13 @@
import com.alibaba.nacos.common.utils.UuidUtils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xinquan.common.core.constant.CacheConstants;
import com.xinquan.common.core.domain.R;
import com.xinquan.common.core.utils.WebUtils;
import com.xinquan.common.core.utils.page.CollUtils;
import com.xinquan.common.core.utils.page.PageDTO;
import com.xinquan.common.log.enums.BusinessType;
+import com.xinquan.common.redis.service.RedisService;
import com.xinquan.common.security.service.TokenService;
import com.xinquan.course.api.domain.Course;
import com.xinquan.order.api.domain.Order;
@@ -67,6 +69,8 @@
private TokenService tokenService;
@Resource
private AppUserWalletRecordService appUserWalletRecordService;
+ @Autowired
+ private RedisService redisService;
@PostMapping("/withdrawList")
@ApiOperation(value = "提现列表-分页", tags = {"管理后台-提现管理"})
@@ -297,6 +301,14 @@
Long userId = loginUser.getUserid();
appUserWithdraw.setAppUserId(userId);
+ Boolean flag = redisService.hasKey(CacheConstants.ADD_CARD_PHONE_CODE_PREFIX + appUserWithdraw.getCellPhone());
+ if(!flag){
+ return R.fail("验证码已失效，请重新获取");
+ }
+ String code = redisService.getCacheObject(CacheConstants.ADD_CARD_PHONE_CODE_PREFIX + appUserWithdraw.getCellPhone());
+ if (!appUserWithdraw.getCode().equals(code)) {
+ return R.fail("验证码不正确");
+ }
appUserBankService.save(appUserWithdraw);
return R.ok();
}
--
Gitblit v1.7.1