From ed3ea6f50a8dcd01bfa7f2a13ec457873d9015f7 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 22 八月 2023 17:56:02 +0800
Subject: [PATCH] 更新接口
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java | 69 ++++++++++++++++------------------
1 files changed, 33 insertions(+), 36 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 2fd68d8..a5fac8d 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
@@ -201,7 +201,7 @@
//发送验证码短信
redisUtil.setStrValue(email, authCode, 5 * 60);//设置五分钟过期
- String path = templatePath + "index.html";
+ String path = templatePath + "driver/index.html";
Document document = Jsoup.parse(new File(path), "UTF-8");
if(1 == language){
document.getElementById("english").remove();
@@ -307,7 +307,7 @@
driverMapper.updateById(driver);
if(ToolUtil.isNotEmpty(driver.getEmail())){
- String path = templatePath + "index.html";
+ String path = templatePath + "driver/index.html";
Document document = Jsoup.parse(new File(path), "UTF-8");
if(1 == language){
document.getElementById("english").remove();
@@ -424,12 +424,9 @@
return ResultUtil.success(loginWarpper);
}
-
driver1 = driverMapper.queryByPhone(phone);
if(null != driver1){
- LoginWarpper loginWarpper = new LoginWarpper();
- loginWarpper.setId(driver1.getId());
- return ResultUtil.success(loginWarpper);
+ return ResultUtil.error(language == 1 ? "账号已存在" : language == 2 ? "Account already exists" : "Le compte existe déjà");
}
Driver driver = new Driver();
driver.setAccount(phone);
@@ -479,7 +476,7 @@
Driver driver = this.selectById(uid);
driver.setLastName(registeredWarpper.getLastName());
driver.setFirstName(registeredWarpper.getFirstName());
- driver.setSex(registeredWarpper.getSex());
+// driver.setSex(registeredWarpper.getSex());
driver.setIdCard(registeredWarpper.getIdCard());
driver.setBirthday(registeredWarpper.getBirthday());
@@ -513,11 +510,11 @@
driver.setPlaceOfPractice(language == 1 ? city1.getChineseName() : language == 2 ? city1.getEnglishName() : city1.getFrenchName());
Calendar calendar = Calendar.getInstance();
- calendar.setTime(registeredWarpper.getGetDriverLicenseDate());
+// calendar.setTime(registeredWarpper.getGetDriverLicenseDate());
Calendar now = Calendar.getInstance();
now.setTime(new Date());
driver.setDriverAge(now.get(Calendar.YEAR) - calendar.get(Calendar.YEAR));
- driver.setGetDriverLicenseDate(registeredWarpper.getGetDriverLicenseDate());
+// driver.setGetDriverLicenseDate(registeredWarpper.getGetDriverLicenseDate());
driver.setDriveCardImgUrl1(registeredWarpper.getDriveCardImgUrl());
driver.setDriveCardImgUrl2(registeredWarpper.getDriveCardImgUrl2());
driver.setEmail(registeredWarpper.getEmail());
@@ -545,7 +542,7 @@
}
if(ToolUtil.isNotEmpty(driver.getEmail())){
- String path1 = templatePath + "index.html";
+ String path1 = templatePath + "driver/index.html";
Document document1 = Jsoup.parse(new File(path1), "UTF-8");
if(1 == language){
document1.getElementById("english").remove();
@@ -624,7 +621,7 @@
driverMapper.updateById(driver);
if(ToolUtil.isNotEmpty(driver.getEmail())){
- String path1 = templatePath + "index.html";
+ String path1 = templatePath + "driver/index.html";
Document document1 = Jsoup.parse(new File(path1), "UTF-8");
if(1 == language){
document1.getElementById("english").remove();
@@ -770,24 +767,24 @@
int size = this.queryMyActivity(uid, new Date(), language).size();
map.put("activity", size);
//获取司机待支付的现金支付订单推送司机支付
- new Thread(new Runnable() {
- @Override
- public void run() {
- List<OrderPrivateCar> orderPrivateCars = orderPrivateCarService.selectList(new EntityWrapper<OrderPrivateCar>().eq("driverId", uid).eq("payType", 4)
- .eq("driverPay", 1).eq("isDelete", 1));
- if(orderPrivateCars.size() > 0){
- OrderPrivateCar orderPrivateCar = orderPrivateCars.get(0);
- pushUtil.pushOfflinePayment(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1);
- return;
- }
- List<OrderLogistics> orderLogistics = orderLogisticsService.selectList(new EntityWrapper<OrderLogistics>().eq("driverId", uid).eq("payType", 4)
- .eq("isDelete", 1).eq("driverPay", 1));
- if(orderLogistics.size() > 0){
- OrderLogistics orderLogistics1 = orderLogistics.get(0);
- pushUtil.pushOfflinePayment(2, orderLogistics1.getDriverId(), orderLogistics1.getId(), orderLogistics1.getType());
- }
- }
- }).start();
+// new Thread(new Runnable() {
+// @Override
+// public void run() {
+// List<OrderPrivateCar> orderPrivateCars = orderPrivateCarService.selectList(new EntityWrapper<OrderPrivateCar>().eq("driverId", uid).eq("payType", 4)
+// .eq("driverPay", 1).eq("isDelete", 1));
+// if(orderPrivateCars.size() > 0){
+// OrderPrivateCar orderPrivateCar = orderPrivateCars.get(0);
+// pushUtil.pushOfflinePayment(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1);
+// return;
+// }
+// List<OrderLogistics> orderLogistics = orderLogisticsService.selectList(new EntityWrapper<OrderLogistics>().eq("driverId", uid).eq("payType", 4)
+// .eq("isDelete", 1).eq("driverPay", 1));
+// if(orderLogistics.size() > 0){
+// OrderLogistics orderLogistics1 = orderLogistics.get(0);
+// pushUtil.pushOfflinePayment(2, orderLogistics1.getDriverId(), orderLogistics1.getId(), orderLogistics1.getType());
+// }
+// }
+// }).start();
return map;
}
@@ -1091,7 +1088,7 @@
driver.setPassword(ShiroKit.md5(password, salt));
this.updateById(driver);
if(ToolUtil.isNotEmpty(driver.getEmail())){
- String path1 = templatePath + "index.html";
+ String path1 = templatePath + "driver/index.html";
Document document1 = Jsoup.parse(new File(path1), "UTF-8");
if(1 == language){
document1.getElementById("english").remove();
@@ -1388,7 +1385,7 @@
driverActivityHistoryMapper.insert(driverActivityHistory);
if(ToolUtil.isNotEmpty(driver.getEmail())) {
- String path1 = templatePath + "index.html";
+ String path1 = templatePath + "driver/index.html";
Document document1 = Jsoup.parse(new File(path1), "UTF-8");
if (1 == language) {
document1.getElementById("english").remove();
@@ -1469,7 +1466,7 @@
driverActivityHistoryMapper.insert(driverActivityHistory);
if(ToolUtil.isNotEmpty(driver.getEmail())) {
- String path1 = templatePath + "index.html";
+ String path1 = templatePath + "driver/index.html";
Document document1 = Jsoup.parse(new File(path1), "UTF-8");
if (1 == language) {
document1.getElementById("english").remove();
@@ -1551,7 +1548,7 @@
driverActivityHistoryMapper.insert(driverActivityHistory);
if(ToolUtil.isNotEmpty(driver.getEmail())) {
- String path1 = templatePath + "index.html";
+ String path1 = templatePath + "driver/index.html";
Document document1 = Jsoup.parse(new File(path1), "UTF-8");
if (1 == language) {
document1.getElementById("english").remove();
@@ -1633,7 +1630,7 @@
driverActivityHistoryMapper.insert(driverActivityHistory);
if(ToolUtil.isNotEmpty(driver.getEmail())) {
- String path1 = templatePath + "index.html";
+ String path1 = templatePath + "driver/index.html";
Document document1 = Jsoup.parse(new File(path1), "UTF-8");
if (1 == language) {
document1.getElementById("english").remove();
@@ -1737,7 +1734,7 @@
if(ToolUtil.isNotEmpty(driver.getEmail())) {
- String path1 = templatePath + "index.html";
+ String path1 = templatePath + "driver/index.html";
Document document1 = Jsoup.parse(new File(path1), "UTF-8");
if (1 == language) {
document1.getElementById("english").remove();
@@ -1821,7 +1818,7 @@
incomeService.saveData(2, dah.getDriverId(), 1, dao.getId(), null, dah.getMoney());
if(ToolUtil.isNotEmpty(driver.getEmail())) {
- String path1 = templatePath + "index.html";
+ String path1 = templatePath + "driver/index.html";
Document document1 = Jsoup.parse(new File(path1), "UTF-8");
if (1 == language) {
document1.getElementById("english").remove();
--
Gitblit v1.7.1