From 48effdca685a209c19dd2a0ccd456470a895784b Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 11 十月 2024 18:01:18 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
index add9fcb..60e5a9e 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
@@ -156,6 +156,9 @@
@Resource
private CarModelMapper carModelMapper;
+
+ @Autowired
+ private ISettlementRecordService settlementRecordService;
@Override
@@ -203,10 +206,11 @@
redisUtil.setStrValue(phone, authCode, 5 * 60);//设置五分钟过期
switch (language){
case 1:
- sms = "您的验证码为：" + authCode + "，该验证码5分钟内有效，请勿泄漏于他人！";
+// sms = "您的验证码为：" + authCode + "，该验证码5分钟内有效，请勿泄漏于他人！";
+ sms = "Your verification code is " + authCode + ", it is valid within 5 minutes, please do not reveal it to others.";
break;
case 2:
- sms = "Your verification code is " + authCode + "，it is valid within 5 minutes, please do not reveal it to others.";
+ sms = "Your verification code is " + authCode + ", it is valid within 5 minutes, please do not reveal it to others.";
break;
case 3:
sms = "Votre code de validation est " + authCode + " et il est valide pendant 5 minutes. Veuillez ne pas le révéler à d’autres personnes.";
@@ -1263,7 +1267,6 @@
if(car.getAuthState()==4){
return ResultUtil.error(language == 1 ? "请完善资料后再出车" : language == 2 ? "Please complete data before driving." : "Veuillez compléter les données avant de conduire.");
}
-
driverWork = new DriverWork();
driverWork.setState(1);
--
Gitblit v1.7.1