From efd4e4fadb4f711a8b0573edc808d6f0045f366c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期日, 08 十月 2023 17:03:15 +0800
Subject: [PATCH] 更新接口
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java | 21 +++++++---
DriverIGOTravel/guns-core/src/main/java/com/stylefeng/guns/core/util/DateUtil.java | 14 ++++++-
DriverIGOTravel/guns-admin/src/main/resources/application.yml | 3 -
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java | 1
DriverIGOTravel/pom.xml | 12 +----
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/WithdrawalServiceImpl.java | 12 +----
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/RegisteredWarpper.java | 10 +++++
7 files changed, 44 insertions(+), 29 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java
index 65116b3..df97b22 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java
@@ -1,5 +1,6 @@
package com.stylefeng.guns;
+import com.stylefeng.guns.core.util.DateUtil;
import com.stylefeng.guns.modular.system.util.GDFalconUtil;
import org.apache.http.client.HttpClient;
import org.apache.http.config.SocketConfig;
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 3836f67..368a89d 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
@@ -547,7 +547,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());
@@ -1497,17 +1497,21 @@
case 1://邀请司机注册
DriverActivityRegistered driverActivityRegistered = driverActivityRegisteredMapper.selectById(dah.getActivityId());
activityWarpper.setId(driverActivityRegistered.getId());
- activityWarpper.setContent("邀请司机注册奖励" + driverActivityRegistered.getMoney() + "元");
+ activityWarpper.setContent(language == 1 ? "邀请司机注册奖励" + driverActivityRegistered.getMoney() + "元" :
+ language == 2 ? "Invitation driver registration reward " + driverActivityRegistered.getMoney() + " yuan" :
+ "Invitation pilote inscription récompense " + driverActivityRegistered.getMoney() + " yuan");
break;
case 2://邀请用户注册
DriverActivityRegistered driverActivityRegistered1 = driverActivityRegisteredMapper.selectById(dah.getActivityId());
activityWarpper.setId(driverActivityRegistered1.getId());
- activityWarpper.setContent("邀请用户注册奖励" + driverActivityRegistered1.getMoney() + "元");
+ activityWarpper.setContent(language == 1 ? "邀请用户注册奖励" + driverActivityRegistered1.getMoney() + "元" :
+ language == 2 ? "" : "");
break;
case 3://累计在线
DriverActivityOnline driverActivityOnline = driverActivityOnlineMapper.selectById(dah.getActivityId());
activityWarpper.setId(driverActivityOnline.getId());
- StringBuffer sb = new StringBuffer("今日");
+ StringBuffer sb = new StringBuffer(language == 1 ? "今日" :
+ language == 2 ? "today" : "aujourd’hui");
DriverWork driverWork = driverWorkMapper.queryNewWork(uid, driverActivityOnline.getType(), 1);
Integer hour = 0;
if(null != driverWork){
@@ -1519,7 +1523,6 @@
break;
case 2:
sb.append("出租车");
-
break;
case 3:
sb.append("城际出行");
@@ -1528,14 +1531,18 @@
sb.append(language == 1 ? "包裹" : language == 2 ? "Package" : "Paquet");
break;
}
- String str = "累计在线" +driverActivityOnline.getOnline() + "小时奖励" +driverActivityOnline.getMoney() + "元";
+ String str = language == 1 ? "累计在线" +driverActivityOnline.getOnline() + "小时奖励" +driverActivityOnline.getMoney() + "元" :
+ language == 2 ? "RMB " + driverActivityOnline.getMoney() + " will be awarded for " + driverActivityOnline.getOnline() + " hours online" :
+ "Bonus de " + driverActivityOnline.getMoney() + " $pour " + driverActivityOnline.getOnline() + " heures cumulées en ligne";
activityWarpper.setContent(sb.append(str).toString());
activityWarpper.setCarryOut((dah.getCarryOut() == 2 || hour > driverActivityOnline.getOnline()) ? driverActivityOnline.getOnline() + "/" +driverActivityOnline.getOnline() : hour + "/" + driverActivityOnline.getOnline());
break;
case 4://订单量
DriverActivityOrder driverActivityOrder = driverActivityOrderMapper.selectById(dah.getActivityId());
activityWarpper.setId(driverActivityOrder.getId());
- activityWarpper.setContent("今日" + driverActivityOrder.getStart() + "-" + driverActivityOrder.getEnd() + "累计接单" + driverActivityOrder.getOrderNum() + "单奖励" + driverActivityOrder.getMoney() + "元");
+ activityWarpper.setContent(language == 1 ? "今日" + driverActivityOrder.getStart() + "-" + driverActivityOrder.getEnd() + "累计接单" + driverActivityOrder.getOrderNum() + "单奖励" + driverActivityOrder.getMoney() + "元" :
+ language == 2 ? "From " + driverActivityOrder.getStart() + " to " + driverActivityOrder.getEnd() + " today, a total of " + driverActivityOrder.getOrderNum() + " orders will be awarded " + driverActivityOrder.getMoney() + " yuan" :
+ "De " + driverActivityOrder.getStart() + " à " + driverActivityOrder.getEnd() + " aujourd’hui, un total de " + driverActivityOrder.getOrderNum() + " commandes recevront " + driverActivityOrder.getMoney() + " yuans");
SimpleDateFormat sdf = new SimpleDateFormat("H:m");
Date start = sdf.parse(driverActivityOrder.getStart());
Date end = sdf.parse(driverActivityOrder.getEnd());
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/WithdrawalServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/WithdrawalServiceImpl.java
index 1b9c440..da6acf4 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/WithdrawalServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/WithdrawalServiceImpl.java
@@ -47,7 +47,6 @@
-
/**
* 提现操作
* @param money
@@ -64,14 +63,9 @@
if(withdrawalRule==null){
return ResultUtil.error(language == 1 ? "暂未设置提现时间，请联系平台" : language == 2 ? "No withdrawal time has been set, please contact the platform" : "Aucune heure de retrait n’a été définie pour le moment. Veuillez contacter la plateforme");
}
- String week =withdrawalRule==1?"星期一":
- withdrawalRule==2?"星期二":
- withdrawalRule==3?"星期三":
- withdrawalRule==4?"星期四":
- withdrawalRule==5?"星期五":
- withdrawalRule==6?"星期六":"星期日";
- String weeks = DateUtil.getAfterDayWeek("0");
- if(!weeks.equals(week)){
+ int weeks = DateUtil.getNowWeekDay();
+
+ if(weeks != withdrawalRule){
return ResultUtil.error((language == 1 ? "每周" : language == 2 ? "Every" : "Chaque") +(withdrawalRule==1? (language == 1 ? "一" : language == 2 ? "Monday" : "lundi") :
withdrawalRule==2?(language == 1 ? "二" : language == 2 ? "Tuesday" : "mardi"):
withdrawalRule==3?(language == 1 ? "三" : language == 2 ? "Wednesday" : "mercredi"):
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/RegisteredWarpper.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/RegisteredWarpper.java
index 13e74a7..84dff6d 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/RegisteredWarpper.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/RegisteredWarpper.java
@@ -17,6 +17,8 @@
private String firstName;
@ApiModelProperty("生日")
private Date birthday;
+ @ApiModelProperty("性别（1=男，2=女）")
+ private Integer sex;
@ApiModelProperty("居住地")
private String driverContactAddress;
@ApiModelProperty("居住地(带分隔符)")
@@ -91,6 +93,14 @@
this.driverContactAddress_ = driverContactAddress_;
}
+ public Integer getSex() {
+ return sex;
+ }
+
+ public void setSex(Integer sex) {
+ this.sex = sex;
+ }
+
public String getIdCard() {
return idCard;
}
diff --git a/DriverIGOTravel/guns-admin/src/main/resources/application.yml b/DriverIGOTravel/guns-admin/src/main/resources/application.yml
index 8d56024..bd01da6 100644
--- a/DriverIGOTravel/guns-admin/src/main/resources/application.yml
+++ b/DriverIGOTravel/guns-admin/src/main/resources/application.yml
@@ -13,8 +13,7 @@
application:
name: driver-server
profiles:
-# active: dev
- active: produce
+ active: @spring.active@
mvc:
static-path-pattern: /static/**
view:
diff --git a/DriverIGOTravel/guns-core/src/main/java/com/stylefeng/guns/core/util/DateUtil.java b/DriverIGOTravel/guns-core/src/main/java/com/stylefeng/guns/core/util/DateUtil.java
index 4d43018..868617b 100644
--- a/DriverIGOTravel/guns-core/src/main/java/com/stylefeng/guns/core/util/DateUtil.java
+++ b/DriverIGOTravel/guns-core/src/main/java/com/stylefeng/guns/core/util/DateUtil.java
@@ -25,6 +25,7 @@
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
+import java.util.TimeZone;
public class DateUtil {
@@ -236,7 +237,6 @@
*/
public static String getAfterDayWeek(String days) {
int daysInt = Integer.parseInt(days);
-
Calendar canlendar = Calendar.getInstance(); // java.util包
canlendar.add(Calendar.DATE, daysInt); // 日期减 如果不够减会将月变动
Date date = canlendar.getTime();
@@ -246,7 +246,17 @@
return dateStr;
}
+
+
+
+ public static int getNowWeekDay() {
+ Calendar canlendar = Calendar.getInstance(); // java.util包
+ int week= canlendar.get(Calendar.DAY_OF_WEEK);
+ return week == 0 ? 7 : week - 1;
+ }
+
+
public static void main(String[] args) {
- System.out.println(getAfterDayWeek("4"));
+ System.out.println(DateUtil.getNowWeekDay());
}
}
diff --git a/DriverIGOTravel/pom.xml b/DriverIGOTravel/pom.xml
index 3766e59..b48b714 100644
--- a/DriverIGOTravel/pom.xml
+++ b/DriverIGOTravel/pom.xml
@@ -221,19 +221,13 @@
<profiles>
<profile>
- <id>local</id>
- <properties>
- <spring.active>local</spring.active>
- </properties>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- </profile>
- <profile>
<id>dev</id>
<properties>
<spring.active>dev</spring.active>
</properties>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
</profile>
<profile>
<id>test</id>
--
Gitblit v1.7.1