From 13d2bd6a27f941cfd8f096a7ae2def858a565363 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期三, 04 九月 2024 11:01:34 +0800
Subject: [PATCH] 修改2.0 bug
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java | 195 +++++++++++++++++++++++++++++++++---------------
1 files changed, 135 insertions(+), 60 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 6fa8d1c..add9fcb 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
@@ -411,11 +411,11 @@
EmailUtil.send(driver.getEmail(), language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense", document.html());
String randomString = ToolUtil.getRandomString(10);
//开始生成pdf收据和html收据
- File file = new File("/usr/local/nginx/html/files/html/");
+ File file = new File("/home/igotechgh/nginx/html/files/html/");
if(!file.exists()){
file.mkdirs();
}
- file = new File("/usr/local/nginx/html/files/html/invitation_" + randomString + ".html");
+ file = new File("/home/igotechgh/nginx/html/files/html/invitation_" + randomString + ".html");
if(!file.exists()){
file.createNewFile();
}
@@ -424,7 +424,7 @@
fileWriter.flush();
fileWriter.close();
- String link ="http://182.160.16.251:81/files/html/invitation_" + randomString + ".html";
+ String link ="https://igo.i-go.group/files/html/invitation_" + randomString + ".html";
TEmail tEmail = new TEmail();
tEmail.setLink(link);
tEmail.setUserId(driver.getId());
@@ -607,11 +607,11 @@
EmailUtil.send(driver.getEmail(), language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense", document.html());
String randomString = ToolUtil.getRandomString(10);
//开始生成pdf收据和html收据
- File file = new File("/usr/local/nginx/html/files/html/");
+ File file = new File("/home/igotechgh/nginx/html/files/html/");
if(!file.exists()){
file.mkdirs();
}
- file = new File("/usr/local/nginx/html/files/html/invitation_" + randomString + ".html");
+ file = new File("/home/igotechgh/nginx/html/files/html/invitation_" + randomString + ".html");
if(!file.exists()){
file.createNewFile();
}
@@ -620,7 +620,7 @@
fileWriter.flush();
fileWriter.close();
- String link ="http://182.160.16.251:81/files/html/invitation_" + randomString + ".html";
+ String link ="https://igo.i-go.group/files/html/invitation_" + randomString + ".html";
TEmail tEmail = new TEmail();
tEmail.setLink(link);
tEmail.setUserId(driver.getId());
@@ -874,11 +874,11 @@
EmailUtil.send(driver.getEmail(), language == 1 ? "成功注册" : language == 2 ? "Registered successfully" : "Enregistré avec succès", document1.html());
String randomString = ToolUtil.getRandomString(10);
//开始生成pdf收据和html收据
- File file = new File("/usr/local/nginx/html/files/html/");
+ File file = new File("/home/igotechgh/nginx/html/files/html/");
if(!file.exists()){
file.mkdirs();
}
- file = new File("/usr/local/nginx/html/files/html/registration_" + randomString + ".html");
+ file = new File("/home/igotechgh/nginx/html/files/html/registration_" + randomString + ".html");
if(!file.exists()){
file.createNewFile();
}
@@ -887,7 +887,7 @@
fileWriter.flush();
fileWriter.close();
- String link ="http://182.160.16.251:81/files/html/registration_" + randomString + ".html";
+ String link ="https://igo.i-go.group/files/html/registration_" + randomString + ".html";
TEmail tEmail = new TEmail();
tEmail.setLink(link);
tEmail.setUserId(driver.getId());
@@ -988,11 +988,11 @@
EmailUtil.send(driver.getEmail(), language == 1 ? "密码重置" : language == 2 ? "Reset password" : "Réinitialiser le mot de passe", document1.html());
String randomString = ToolUtil.getRandomString(10);
//开始生成pdf收据和html收据
- File file = new File("/usr/local/nginx/html/files/html/");
+ File file = new File("/home/igotechgh/nginx/html/files/html/");
if(!file.exists()){
file.mkdirs();
}
- file = new File("/usr/local/nginx/html/files/html/reset_" + randomString + ".html");
+ file = new File("/home/igotechgh/nginx/html/files/html/reset_" + randomString + ".html");
if(!file.exists()){
file.createNewFile();
}
@@ -1001,7 +1001,7 @@
fileWriter.flush();
fileWriter.close();
- String link ="http://182.160.16.251:81/files/html/reset_" + randomString + ".html";
+ String link ="https://igo.i-go.group/files/html/reset_" + randomString + ".html";
TEmail tEmail = new TEmail();
tEmail.setLink(link);
tEmail.setUserId(driver.getId());
@@ -1031,7 +1031,7 @@
*/
@Override
public Map<String, Object> queryPhone(Double lat, Double lnt) throws Exception {
- ReverseGeocodeVo reverseGeocode = GoogleMapUtil.getReverseGeocode(lat, lnt);
+ ReverseGeocodeVo reverseGeocode = GoogleMapUtil.getReverseGeocode(lat, lnt, null);
if(null == reverseGeocode){
System.err.println("获取地址异常");
return null;
@@ -1228,13 +1228,13 @@
}).start();
switch (language){
case 1:
- audioUrl = "http://182.160.16.251:81/files/audio/system/AfterWork-CN.mp3";
+ audioUrl = "https://igo.i-go.group/files/audio/system/AfterWork-CN.mp3";
break;
case 2:
- audioUrl = "http://182.160.16.251:81/files/audio/system/AfterWork-EN.mp3";
+ audioUrl = "https://igo.i-go.group/files/audio/system/AfterWork-EN.mp3";
break;
case 3:
- audioUrl = "http://182.160.16.251:81/files/audio/system/AfterWork-FR.mp3";
+ audioUrl = "https://igo.i-go.group/files/audio/system/AfterWork-FR.mp3";
break;
}
}else{
@@ -1299,13 +1299,13 @@
switch (language){
case 1:
- audioUrl = "http://182.160.16.251:81/files/audio/system/AtWork-CN.mp3";
+ audioUrl = "https://igo.i-go.group/files/audio/system/AtWork-CN.mp3";
break;
case 2:
- audioUrl = "http://182.160.16.251:81/files/audio/system/AtWork-EN.mp3";
+ audioUrl = "https://igo.i-go.group/files/audio/system/AtWork-EN.mp3";
break;
case 3:
- audioUrl = "http://182.160.16.251:81/files/audio/system/AtWork-FR.mp3";
+ audioUrl = "https://igo.i-go.group/files/audio/system/AtWork-FR.mp3";
break;
}
}
@@ -1587,11 +1587,11 @@
EmailUtil.send(driver.getEmail(), language == 1 ? "密码重置" : language == 2 ? "Reset password" : "Réinitialiser le mot de passe", document1.html());
String randomString = ToolUtil.getRandomString(10);
//开始生成pdf收据和html收据
- File file = new File("/usr/local/nginx/html/files/html/");
+ File file = new File("/home/igotechgh/nginx/html/files/html/");
if(!file.exists()){
file.mkdirs();
}
- file = new File("/usr/local/nginx/html/files/html/reset_" + randomString + ".html");
+ file = new File("/home/igotechgh/nginx/html/files/html/reset_" + randomString + ".html");
if(!file.exists()){
file.createNewFile();
}
@@ -1600,7 +1600,7 @@
fileWriter.flush();
fileWriter.close();
- String link ="http://182.160.16.251:81/files/html/reset_" + randomString + ".html";
+ String link ="https://igo.i-go.group/files/html/reset_" + randomString + ".html";
TEmail tEmail = new TEmail();
tEmail.setLink(link);
tEmail.setUserId(driver.getId());
@@ -1834,6 +1834,80 @@
}
return list;
}
+
+
+ @Override
+ public List<ActivityWarpper> queryHistoryList(Integer uid, Date time, Integer language) throws Exception {
+ List<ActivityWarpper> list = new ArrayList<>();
+ Map<String, Date> date = dateUtil.getStartAndEndDate(time);
+ List<DriverActivityHistory> driverActivityHistories = driverActivityHistoryMapper.queryHistoryList(uid, null, null, date.get("startTime"), date.get("endTime"));
+
+ SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd");
+ for(DriverActivityHistory dah : driverActivityHistories){
+ ActivityWarpper activityWarpper = new ActivityWarpper();
+ switch (dah.getType()){
+ case 1://邀请司机注册
+ DriverActivityRegistered driverActivityRegistered = driverActivityRegisteredMapper.selectById(dah.getActivityId());
+ activityWarpper.setId(driverActivityRegistered.getId());
+ activityWarpper.setContent(language == 1 ? "邀请司机注册奖励GHS" + driverActivityRegistered.getMoney() :
+ language == 2 ? " Invite drivers to register for a reward of GHS" + driverActivityRegistered.getMoney():
+ "Invitez les chauffeurs à s’inscrire pour une récompense de GHS" + driverActivityRegistered.getMoney());
+ break;
+ case 2://邀请用户注册
+ DriverActivityRegistered driverActivityRegistered1 = driverActivityRegisteredMapper.selectById(dah.getActivityId());
+ activityWarpper.setId(driverActivityRegistered1.getId());
+ activityWarpper.setContent(language == 1 ? "邀请用户注册奖励GHS" + driverActivityRegistered1.getMoney() :
+ language == 2 ? "Invite users to register for a reward of GHS" + driverActivityRegistered1.getMoney():
+ "Invitez les utilisateurs à s’inscrire pour une récompense de GHS" + driverActivityRegistered1.getMoney());
+ break;
+ case 3://累计在线
+ DriverActivityOnline driverActivityOnline = driverActivityOnlineMapper.selectById(dah.getActivityId());
+ activityWarpper.setId(driverActivityOnline.getId());
+ StringBuffer sb = new StringBuffer(language == 1 ? "今日" :
+ language == 2 ? "Today, stay online receiving orders of " : "Aujourd’hui, reste en ligne à recevoir des commandes ");
+ DriverOnline query = driverOnlineMapper.query(uid, sdf1.format(new Date()), driverActivityOnline.getType(), 0);
+ Integer hour = 0;
+ if(null != query){
+ hour = Long.valueOf(query.getDuration() / 3600).intValue();
+ }
+ switch (driverActivityOnline.getType()){
+ case 1:
+ sb.append(language == 1 ? "打车" : language == 2 ? "ride" : "de course");
+ break;
+ case 2:
+ sb.append("出租车");
+ continue;
+ case 3:
+ sb.append("城际出行");
+ continue;
+ case 4:
+ sb.append(language == 1 ? "包裹" : language == 2 ? "delivery" : "de livraison");
+ break;
+ }
+ String str = language == 1 ? "累计在线" +driverActivityOnline.getOnline() + "小时奖励GHS" +driverActivityOnline.getMoney():
+ language == 2 ? " for " + driverActivityOnline.getOnline() + " hours to get a reward of GHS" + driverActivityOnline.getMoney():
+ " pendant " + driverActivityOnline.getOnline() + " heures afin d'obtenir une récompense de GHS" + driverActivityOnline.getMoney();
+ 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(language == 1 ? "今日" + driverActivityOrder.getStart() + "-" + driverActivityOrder.getEnd() + "累计接单" + driverActivityOrder.getOrderNum() + "单奖励GHS" + driverActivityOrder.getMoney():
+ language == 2 ? "Today " + driverActivityOrder.getStart() + "-" + driverActivityOrder.getEnd() + ", complete " + driverActivityOrder.getOrderNum() + " orders for a reward of GHS" + driverActivityOrder.getMoney() :
+ "Aujourd’hui de " + driverActivityOrder.getStart() + " à " + driverActivityOrder.getEnd() + ", complétez " + driverActivityOrder.getOrderNum() + " commandes pour une récompense de GHS" + driverActivityOrder.getMoney());
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ Date start = sdf.parse(sdf1.format(time) + " " + driverActivityOrder.getStart() + ":00");
+ Date end = sdf.parse(sdf1.format(time) + " " + driverActivityOrder.getEnd() + ":59");
+ Integer integer = orderService.queryOrderNum(uid, start, end);
+ activityWarpper.setCarryOut(integer.compareTo(driverActivityOrder.getOrderNum()) > 0 ? driverActivityOrder.getOrderNum() + "/" + driverActivityOrder.getOrderNum() : integer + "/" + driverActivityOrder.getOrderNum());
+ break;
+ }
+ list.add(activityWarpper);
+ }
+ return list;
+ }
+
/**
@@ -1912,7 +1986,7 @@
Element rewardToday_award = document1.getElementById("rewardToday_award");
rewardToday_award.text("奖金 GHS" + driverActivityHistory.getMoney());
Element rewardToday_content = document1.getElementById("rewardToday_content");
- rewardToday_content.text("邀请司机注册即可获得奖励。\n注意此活动是有时间限制的，详情请查看I-GO平台。");
+ rewardToday_content.html("邀请司机注册即可获得奖励。<br/>注意此活动是有时间限制的，详情请查看I-GO平台。");
}
if (2 == language) {
document1.getElementById("chinese").remove();
@@ -1933,7 +2007,7 @@
Element rewardToday1_award = document1.getElementById("rewardToday1_award");
rewardToday1_award.text("GHS " + driverActivityHistory.getMoney() + " BONUS");
Element rewardToday1_content = document1.getElementById("rewardToday1_content");
- rewardToday1_content.text("Get a bonus on I-GO today.\nInvite drivers to register to get the bonus.\nNote that this is a limited-time offer. Check your app for more details.");
+ rewardToday1_content.html("Invite drivers to register to get the bonus.<br/>Note that this is a limited-time offer. Check your app for more details.");
}
if (3 == language) {
document1.getElementById("chinese").remove();
@@ -1954,16 +2028,16 @@
Element rewardToday2_award = document1.getElementById("rewardToday2_award");
rewardToday2_award.text("Bonus GHS " + driverActivityHistory.getMoney());
Element rewardToday2_content = document1.getElementById("rewardToday2_content");
- rewardToday2_content.text("Obtenez un bonus sur I-GO dès aujourd’hui.\nInvitez les chauffeurs à s’inscrire pour obtenir le bonus.\nNotez qu’il s’agit d’une offre d’une durée limitée. Consultez votre application pour plus de détails.");
+ rewardToday2_content.html("Invitez les chauffeurs à s’inscrire pour obtenir le bonus.<br/>Notez qu’il s’agit d’une offre d’une durée limitée. Consultez votre application pour plus de détails.");
}
EmailUtil.send(driver.getEmail(), language == 1 ? "邀请司机奖励（活动）" : language == 2 ? "Invite drivers and earn" : "Invitez des chauffeurs et gagnez de l’argent", document1.html());
String randomString = ToolUtil.getRandomString(10);
//开始生成pdf收据和html收据
- File file = new File("/usr/local/nginx/html/files/html/");
+ File file = new File("/home/igotechgh/nginx/html/files/html/");
if(!file.exists()){
file.mkdirs();
}
- file = new File("/usr/local/nginx/html/files/html/activity_" + randomString + ".html");
+ file = new File("/home/igotechgh/nginx/html/files/html/activity_" + randomString + ".html");
if(!file.exists()){
file.createNewFile();
}
@@ -1972,7 +2046,7 @@
fileWriter.flush();
fileWriter.close();
- String link ="http://182.160.16.251:81/files/html/activity_" + randomString + ".html";
+ String link ="https://igo.i-go.group/files/html/activity_" + randomString + ".html";
TEmail tEmail = new TEmail();
tEmail.setLink(link);
tEmail.setUserId(driver.getId());
@@ -2035,7 +2109,7 @@
Element rewardToday_award = document1.getElementById("rewardToday_award");
rewardToday_award.text("奖金 GHS" + driverActivityHistory.getMoney());
Element rewardToday_content = document1.getElementById("rewardToday_content");
- rewardToday_content.text("邀请用户注册即可获得奖励。\n 注意此活动是有时间限制的，详情请查看I-GO平台。");
+ rewardToday_content.html("邀请用户注册即可获得奖励。<br/> 注意此活动是有时间限制的，详情请查看I-GO平台。");
}
if (2 == language) {
document1.getElementById("chinese").remove();
@@ -2056,7 +2130,7 @@
Element rewardToday1_award = document1.getElementById("rewardToday1_award");
rewardToday1_award.text("GHS " + driverActivityHistory.getMoney() + " BONUS");
Element rewardToday1_content = document1.getElementById("rewardToday1_content");
- rewardToday1_content.text("Get a bonus on I-GO today.\nInvite users to register to get the bonus.\nNote that this is a limited-time offer. Check your app for more details.");
+ rewardToday1_content.html("Invite users to register to get the bonus.<br/>Note that this is a limited-time offer. Check your app for more details.");
}
if (3 == language) {
document1.getElementById("chinese").remove();
@@ -2077,16 +2151,16 @@
Element rewardToday2_award = document1.getElementById("rewardToday2_award");
rewardToday2_award.text("Bonus GHS " + driverActivityHistory.getMoney());
Element rewardToday2_content = document1.getElementById("rewardToday2_content");
- rewardToday2_content.text("Obtenez un bonus sur I-GO dès aujourd’hui.\nInvitez les utilisateurs à s’inscrire pour obtenir le bonus.\nNotez qu’il s’agit d’une offre d’une durée limitée. Consultez votre application pour plus de détails.");
+ rewardToday2_content.html("Invitez les utilisateurs à s’inscrire pour obtenir le bonus.<br/>Notez qu’il s’agit d’une offre d’une durée limitée. Consultez votre application pour plus de détails.");
}
EmailUtil.send(driver.getEmail(), language == 1 ? "邀请用户奖励(活动)" : language == 2 ? "Invite users and earn" : "Invitez des utilisateurs et gagnez de l’argent", document1.html());
String randomString = ToolUtil.getRandomString(10);
//开始生成pdf收据和html收据
- File file = new File("/usr/local/nginx/html/files/html/");
+ File file = new File("/home/igotechgh/nginx/html/files/html/");
if(!file.exists()){
file.mkdirs();
}
- file = new File("/usr/local/nginx/html/files/html/activity_" + randomString + ".html");
+ file = new File("/home/igotechgh/nginx/html/files/html/activity_" + randomString + ".html");
if(!file.exists()){
file.createNewFile();
}
@@ -2095,7 +2169,7 @@
fileWriter.flush();
fileWriter.close();
- String link ="http://182.160.16.251:81/files/html/activity_" + randomString + ".html";
+ String link ="https://igo.i-go.group/files/html/activity_" + randomString + ".html";
TEmail tEmail = new TEmail();
tEmail.setLink(link);
tEmail.setUserId(driver.getId());
@@ -2159,7 +2233,7 @@
Element rewardToday_award = document1.getElementById("rewardToday_award");
rewardToday_award.text("奖金 GHS" + driverActivityHistory.getMoney());
Element rewardToday_content = document1.getElementById("rewardToday_content");
- rewardToday_content.text("今日累计在线" + driverActivityOnline.getOnline() + "小时即可活动奖励。\n 注意此活动是有时间限制的，详情请查看I-GO平台。");
+ rewardToday_content.html("今日累计在线" + driverActivityOnline.getOnline() + "小时即可活动奖励。<br/> 注意此活动是有时间限制的，详情请查看I-GO平台。");
}
if (2 == language) {
document1.getElementById("chinese").remove();
@@ -2180,7 +2254,7 @@
Element rewardToday1_award = document1.getElementById("rewardToday1_award");
rewardToday1_award.text("GHS " + driverActivityHistory.getMoney() + " BONUS");
Element rewardToday1_content = document1.getElementById("rewardToday1_content");
- rewardToday1_content.text("Get a bonus for driving on I-GO today.\nStay online for " + driverActivityOnline.getOnline() + " hours to get the bonus.\nNote that this is a limited-time offer. Check your app for more details.");
+ rewardToday1_content.html("Stay online for " + driverActivityOnline.getOnline() + " hours to get the bonus.<br/>Note that this is a limited-time offer. Check your app for more details.");
}
if (3 == language) {
document1.getElementById("chinese").remove();
@@ -2201,16 +2275,16 @@
Element rewardToday2_award = document1.getElementById("rewardToday2_award");
rewardToday2_award.text("Bonus GHS " + driverActivityHistory.getMoney());
Element rewardToday2_content = document1.getElementById("rewardToday2_content");
- rewardToday2_content.text("Obtenez un bonus pour conduire sur I-GO dès aujourd’hui.\nRestez en ligne pendant " + driverActivityOnline.getOnline() + " heures pour obtenir le bonus.\nNotez qu’il s’agit d’une offre d’une durée limitée. Consultez votre application pour plus de détails.");
+ rewardToday2_content.html("Restez en ligne pendant " + driverActivityOnline.getOnline() + " heures pour obtenir le bonus.<br/>Notez qu’il s’agit d’une offre d’une durée limitée. Consultez votre application pour plus de détails.");
}
EmailUtil.send(driver.getEmail(), language == 1 ? "在线时长奖励（活动）" : language == 2 ? "Online-duration reward activity" : "Activité de récompense en ligne", document1.html());
String randomString = ToolUtil.getRandomString(10);
//开始生成pdf收据和html收据
- File file = new File("/usr/local/nginx/html/files/html/");
+ File file = new File("/home/igotechgh/nginx/html/files/html/");
if(!file.exists()){
file.mkdirs();
}
- file = new File("/usr/local/nginx/html/files/html/activity_" + randomString + ".html");
+ file = new File("/home/igotechgh/nginx/html/files/html/activity_" + randomString + ".html");
if(!file.exists()){
file.createNewFile();
}
@@ -2219,7 +2293,7 @@
fileWriter.flush();
fileWriter.close();
- String link ="http://182.160.16.251:81/files/html/activity_" + randomString + ".html";
+ String link ="https://igo.i-go.group/files/html/activity_" + randomString + ".html";
TEmail tEmail = new TEmail();
tEmail.setLink(link);
tEmail.setUserId(driver.getId());
@@ -2283,7 +2357,7 @@
Element rewardToday_award = document1.getElementById("rewardToday_award");
rewardToday_award.text("奖金 GHS" + driverActivityHistory.getMoney());
Element rewardToday_content = document1.getElementById("rewardToday_content");
- rewardToday_content.text("今日累计完成" + driverActivityOrder.getOrderNum() + "单即可活动奖励。\n 注意此活动是有时间限制的，详情请查看I-GO平台。");
+ rewardToday_content.html("今日累计完成" + driverActivityOrder.getOrderNum() + "单即可活动奖励。<br/> 注意此活动是有时间限制的，详情请查看I-GO平台。");
}
if (2 == language) {
document1.getElementById("chinese").remove();
@@ -2304,7 +2378,7 @@
Element rewardToday1_award = document1.getElementById("rewardToday1_award");
rewardToday1_award.text("GHS " + driverActivityHistory.getMoney() + " BONUS");
Element rewardToday1_content = document1.getElementById("rewardToday1_content");
- rewardToday1_content.text("Get a bonus for driving on I-GO today.\nStay online and complete " + driverActivityOrder.getOrderNum() + " trips to get the bonus.\nNote that this is a limited-time offer. Check your app for more details.");
+ rewardToday1_content.html("Stay online and complete " + driverActivityOrder.getOrderNum() + " trips to get the bonus.<br/>Note that this is a limited-time offer. Check your app for more details.");
}
if (3 == language) {
document1.getElementById("chinese").remove();
@@ -2325,16 +2399,16 @@
Element rewardToday2_award = document1.getElementById("rewardToday2_award");
rewardToday2_award.text("Bonus GHS " + driverActivityHistory.getMoney());
Element rewardToday2_content = document1.getElementById("rewardToday2_content");
- rewardToday2_content.text("Obtenez un bonus pour conduire sur I-GO dès aujourd’hui.\nRestez en ligne et effectuez " + driverActivityOrder.getOrderNum() + " trajets pour obtenir le bonus.\nNotez qu’il s’agit d’une offre d’une durée limitée. Consultez votre application pour plus de détails.");
+ rewardToday2_content.html("Restez en ligne et effectuez " + driverActivityOrder.getOrderNum() + " trajets pour obtenir le bonus.<br/>Notez qu’il s’agit d’une offre d’une durée limitée. Consultez votre application pour plus de détails.");
}
EmailUtil.send(driver.getEmail(), language == 1 ? "累计接单奖励（活动）" : language == 2 ? "Cumulative order activity" : "Activité cumulée des commandes", document1.html());
String randomString = ToolUtil.getRandomString(10);
//开始生成pdf收据和html收据
- File file = new File("/usr/local/nginx/html/files/html/");
+ File file = new File("/home/igotechgh/nginx/html/files/html/");
if(!file.exists()){
file.mkdirs();
}
- file = new File("/usr/local/nginx/html/files/html/activity_" + randomString + ".html");
+ file = new File("/home/igotechgh/nginx/html/files/html/activity_" + randomString + ".html");
if(!file.exists()){
file.createNewFile();
}
@@ -2343,7 +2417,7 @@
fileWriter.flush();
fileWriter.close();
- String link ="http://182.160.16.251:81/files/html/activity_" + randomString + ".html";
+ String link ="https://igo.i-go.group/files/html/activity_" + randomString + ".html";
TEmail tEmail = new TEmail();
tEmail.setLink(link);
tEmail.setUserId(driver.getId());
@@ -2428,7 +2502,7 @@
Element reward_user = document1.getElementById("reward_user");
reward_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
Element reward_content = document1.getElementById("reward_content");
- reward_content.text("今日累计在线" + dao.getOnline() + "小时，获得奖励GHS" + dah.getMoney() + "，请查收。\n详情请查看I-GO平台。");
+ reward_content.html("今日累计在线" + dao.getOnline() + "小时，获得奖励GHS" + dah.getMoney() + "，请查收。<br/>详情请查看I-GO平台。");
}
if (2 == language) {
document1.getElementById("chinese").remove();
@@ -2447,7 +2521,7 @@
Element reward1_user = document1.getElementById("reward1_user");
reward1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
Element reward1_content = document1.getElementById("reward1_content");
- reward1_content.text("You stayed online for " + dao.getOnline() + " hours today, and got a bonus of GHS" + dah.getMoney() + ", please check.\nCheck your app for more details.");
+ reward1_content.html("You stayed online for " + dao.getOnline() + " hours today, and got a bonus of GHS" + dah.getMoney() + ", please check.<br/>Check your app for more details.");
}
if (3 == language) {
document1.getElementById("chinese").remove();
@@ -2466,16 +2540,16 @@
Element reward2_user = document1.getElementById("reward2_user");
reward2_user.text("Cher(ère) " + driver.getFirstName() + "" + driver.getLastName() + "，");
Element reward2_content = document1.getElementById("reward2_content");
- reward2_content.text("Vous êtes resté en ligne pendant " + dao.getOnline() + " heures aujourd’hui et avez obtenu un bonus de GHS" + dah.getMoney() + ", veuillez vérifier.\nConsultez votre application pour plus de détails.");
+ reward2_content.html("Vous êtes resté en ligne pendant " + dao.getOnline() + " heures aujourd’hui et avez obtenu un bonus de GHS" + dah.getMoney() + ", veuillez vérifier.<br/>Consultez votre application pour plus de détails.");
}
EmailUtil.send(driver.getEmail(), language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense", document1.html());
String randomString = ToolUtil.getRandomString(10);
//开始生成pdf收据和html收据
- File file = new File("/usr/local/nginx/html/files/html/");
+ File file = new File("/home/igotechgh/nginx/html/files/html/");
if(!file.exists()){
file.mkdirs();
}
- file = new File("/usr/local/nginx/html/files/html/rewards_" + randomString + ".html");
+ file = new File("/home/igotechgh/nginx/html/files/html/rewards_" + randomString + ".html");
if(!file.exists()){
file.createNewFile();
}
@@ -2484,7 +2558,7 @@
fileWriter.flush();
fileWriter.close();
- String link ="http://182.160.16.251:81/files/html/rewards_" + randomString + ".html";
+ String link ="https://igo.i-go.group/files/html/rewards_" + randomString + ".html";
TEmail tEmail = new TEmail();
tEmail.setLink(link);
tEmail.setUserId(driver.getId());
@@ -2547,7 +2621,7 @@
Element reward_user = document1.getElementById("reward_user");
reward_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
Element reward_content = document1.getElementById("reward_content");
- reward_content.text("今日累计接单" + dao.getOrderNum() + "单，获得奖励GHS" + dah.getMoney() + "，请查收。\n详情请查看I-GO平台。");
+ reward_content.html("今日累计接单" + dao.getOrderNum() + "单，获得奖励GHS" + dah.getMoney() + "，请查收。<br/>详情请查看I-GO平台。");
}
if (2 == language) {
document1.getElementById("chinese").remove();
@@ -2566,7 +2640,7 @@
Element reward1_user = document1.getElementById("reward1_user");
reward1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
Element reward1_content = document1.getElementById("reward1_content");
- reward1_content.text("You completed " + dao.getOrderNum() + " trips today, and got a bonus of GHS" + dah.getMoney() + ", please check.\nCheck your app for more details.");
+ reward1_content.html("You completed " + dao.getOrderNum() + " trips today, and got a bonus of GHS" + dah.getMoney() + ", please check.<br/>Check your app for more details.");
}
if (3 == language) {
document1.getElementById("chinese").remove();
@@ -2585,17 +2659,17 @@
Element reward2_user = document1.getElementById("reward2_user");
reward2_user.text("Cher(ère) " + driver.getFirstName() + "" + driver.getLastName() + "，");
Element reward2_content = document1.getElementById("reward2_content");
- reward2_content.text("Vous avez effectué " + dao.getOrderNum() + " trajets aujourd’hui et avez reçu un bonus de GHS" + dah.getMoney() + ", veuillez vérifier.\nConsultez votre application pour plus de détails.");
+ reward2_content.html("Vous avez effectué " + dao.getOrderNum() + " trajets aujourd’hui et avez reçu un bonus de GHS" + dah.getMoney() + ", veuillez vérifier.<br/>Consultez votre application pour plus de détails.");
}
EmailUtil.send(driver.getEmail(), language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense", document1.html());
String randomString = ToolUtil.getRandomString(10);
//开始生成pdf收据和html收据
- File file = new File("/usr/local/nginx/html/files/html/");
+ File file = new File("/home/igotechgh/nginx/html/files/html/");
if(!file.exists()){
file.mkdirs();
}
- file = new File("/usr/local/nginx/html/files/html/rewards_" + randomString + ".html");
+ file = new File("/home/igotechgh/nginx/html/files/html/rewards_" + randomString + ".html");
if(!file.exists()){
file.createNewFile();
}
@@ -2604,7 +2678,7 @@
fileWriter.flush();
fileWriter.close();
- String link ="http://182.160.16.251:81/files/html/rewards_" + randomString + ".html";
+ String link ="https://igo.i-go.group/files/html/rewards_" + randomString + ".html";
TEmail tEmail = new TEmail();
tEmail.setLink(link);
tEmail.setUserId(driver.getId());
@@ -3115,13 +3189,14 @@
* @throws Exception
*/
@Override
- public List<Driver> queryIdleDriver(Integer type, Integer serverCarModelId, Double lon, Double lat, Double distance, Integer companyId) throws Exception {
+ public List<Driver> queryIdleDriver(Integer userId, Integer type, Integer serverCarModelId, Double lon, Double lat, Double distance, Integer companyId) throws Exception {
List<Driver> drivers = driverMapper.queryIdleDriver_(type, serverCarModelId, companyId);
+ String tripId = redisUtil.getValue("trip" + userId);
List<Driver> list = new ArrayList<>();
for(Driver driver : drivers){
String value = redisUtil.getValue("DRIVER" + driver.getId());
if(ToolUtil.isNotEmpty(value)){
- DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(lat, lon, Double.parseDouble(value.split(",")[1]), Double.parseDouble(value.split(",")[0]));
+ DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(lat, lon, Double.parseDouble(value.split(",")[1]), Double.parseDouble(value.split(",")[0]), tripId);
if(null != distancematrix){
if(distancematrix.getDistance() < (distance * 1000)){
list.add(driver);
--
Gitblit v1.7.1