From 9e5d3f634b52333c076eb443a64de873c5ddceed Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 09 十一月 2024 14:39:46 +0800
Subject: [PATCH] 代码提交
---
xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/controller/management/MgtOrderController.java | 12 ++++++------
xinquan-auth/src/main/java/com/xinquan/auth/controller/TokenController.java | 7 +++++++
2 files changed, 13 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-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);
--
Gitblit v1.7.1