From 09cb511d97d815e68ddd583aff06529dfa88442e Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 12 十二月 2023 15:42:40 +0800
Subject: [PATCH] 修改bug
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java | 22 +++---
DriverIGOTravel/guns-admin/guns-admin.iml | 45 ++++++++++++--
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java | 12 ++--
DriverIGOTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java | 62 ++++++++++----------
4 files changed, 85 insertions(+), 56 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/guns-admin.iml b/DriverIGOTravel/guns-admin/guns-admin.iml
index 2b207c6..fdd2e69 100644
--- a/DriverIGOTravel/guns-admin/guns-admin.iml
+++ b/DriverIGOTravel/guns-admin/guns-admin.iml
@@ -6,7 +6,14 @@
</facet>
<facet type="web" name="Web">
<configuration>
- <webroots />
+ <webroots>
+ <root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
+ </webroots>
+ <sourceRoots>
+ <root url="file://$MODULE_DIR$/src/main/java" />
+ <root url="file://$MODULE_DIR$/src/main/resources" />
+ <root url="file://$MODULE_DIR$/src/main/webapp" />
+ </sourceRoots>
</configuration>
</facet>
</component>
@@ -17,10 +24,16 @@
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/webapp" type="java-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.18.20" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
+ <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
+ <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.0.4" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-eureka-client:2.0.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:2.0.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:2.0.1.RELEASE" level="project" />
@@ -50,12 +63,9 @@
<orderEntry type="library" scope="RUNTIME" name="Maven: aopalliance:aopalliance:1.0" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: com.github.vlsi.compactmap:compactmap:1.2.1" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: com.github.andrewoma.dexx:dexx-collections:0.2" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.5" level="project" />
<orderEntry type="library" name="Maven: com.netflix.eureka:eureka-core:1.9.3" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.codehaus.woodstox:woodstox-core-asl:4.4.1" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: javax.xml.stream:stax-api:1.0-2" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: org.codehaus.woodstox:stax2-api:3.1.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-archaius:2.0.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-archaius:2.0.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.8" level="project" />
@@ -132,7 +142,6 @@
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.0.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.0.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.5" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.5" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.5" level="project" />
<orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.11.Final" level="project" />
<orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
@@ -167,6 +176,7 @@
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-devtools:2.0.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.0.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.0.4.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: cn.hutool:hutool-all:4.1.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.0.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:8.5.32" level="project" />
@@ -216,13 +226,11 @@
<orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.5.0" level="project" />
<orderEntry type="library" name="Maven: cn.jpush.api:jpush-client:3.3.10" level="project" />
<orderEntry type="library" name="Maven: cn.jpush.api:jiguang-common:1.1.3" level="project" />
- <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.6" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-all:4.1.23.Final" level="project" />
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.5" level="project" />
<orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
<orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
<orderEntry type="library" name="Maven: com.alipay.sdk:alipay-sdk-java:4.8.10.ALL" level="project" />
- <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.62" level="project" />
<orderEntry type="library" name="Maven: com.aliyun.oss:aliyun-sdk-oss:3.8.0" level="project" />
<orderEntry type="library" name="Maven: org.jdom:jdom:1.1" level="project" />
@@ -232,7 +240,6 @@
<orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-sts:3.0.0" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-ecs:4.2.0" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-core:4.4.3" level="project" />
- <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.10" level="project" />
<orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.0" level="project" />
<orderEntry type="library" name="Maven: org.jacoco:org.jacoco.agent:runtime:0.8.3" level="project" />
<orderEntry type="library" name="Maven: org.ini4j:ini4j:0.5.4" level="project" />
@@ -248,5 +255,27 @@
<orderEntry type="library" name="Maven: io.grpc:grpc-context:1.27.2" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-simple:1.7.25" level="project" />
<orderEntry type="library" name="Maven: org.gavaghan:geodesy:1.1.3" level="project" />
+ <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.13.1" level="project" />
+ <orderEntry type="library" name="Maven: io.cellulant:CheckoutEncryption:0.0.1" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
+ <orderEntry type="library" name="Maven: com.twilio.sdk:twilio:9.9.0" level="project" />
+ <orderEntry type="library" name="Maven: commons-io:commons-io:2.7" level="project" />
+ <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt-api:0.11.2" level="project" />
+ <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt-jackson:0.11.2" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: io.jsonwebtoken:jjwt-impl:0.11.2" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.5" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.5" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.9.5" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.9.5" level="project" />
+ <orderEntry type="library" name="Maven: org.codehaus.woodstox:stax2-api:3.1.4" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.woodstox:woodstox-core:5.0.3" level="project" />
+ <orderEntry type="library" name="Maven: com.itextpdf:html2pdf:3.0.2" level="project" />
+ <orderEntry type="library" name="Maven: com.itextpdf:forms:7.1.13" level="project" />
+ <orderEntry type="library" name="Maven: com.itextpdf:kernel:7.1.13" level="project" />
+ <orderEntry type="library" name="Maven: com.itextpdf:io:7.1.13" level="project" />
+ <orderEntry type="library" name="Maven: com.itextpdf:layout:7.1.13" level="project" />
+ <orderEntry type="library" name="Maven: com.itextpdf:svg:7.1.13" level="project" />
+ <orderEntry type="library" name="Maven: com.itextpdf:styled-xml-parser:7.1.13" level="project" />
+ <orderEntry type="library" name="Maven: com.itextpdf:font-asian:7.1.13" level="project" />
</component>
</module>
\ No newline at end of file
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
index 1fe2402..a115289 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
@@ -1152,9 +1152,9 @@
document.getElementById("carAudit").remove();
Element email_user = document.getElementById("email_user");
- email_user.text("您好 ，");
+ email_user.text("您好 " + userInfo.getFirstName() + " " + userInfo.getLastName());
Element email_content = document.getElementById("email_content");
- email_content.text("邮件取件码是：" + random + "，请在5分钟内完成验证");
+ email_content.text("包裹取件码是:" + random + "，请在 5 分钟内完成验证。");
}
if(2 == language){
document.getElementById("chinese").remove();
@@ -1170,9 +1170,9 @@
document.getElementById("carAudit1").remove();
Element email1_user = document.getElementById("email1_user");
- email1_user.text("Hello ，");
+ email1_user.text("Hello " + userInfo.getFirstName() + " " + userInfo.getLastName());
Element email1_content = document.getElementById("email1_content");
- email1_content.text("pickup code is " + random + ", please complete the verification within 5 minutes. If the request wasn't made by you, please ignore this email.");
+ email1_content.text("Your package pickup code is " + random + ", please complete the verification within 5 minutes.");
}
if(3 == language){
document.getElementById("chinese").remove();
@@ -1188,9 +1188,9 @@
document.getElementById("carAudit2").remove();
Element email2_user = document.getElementById("email2_user");
- email2_user.text("Bonjour ，");
+ email2_user.text("Bonjour " + userInfo.getFirstName() + " " + userInfo.getLastName());
Element email2_content = document.getElementById("email2_content");
- email2_content.text("Vous êtes lié à une adresse e-mail. Le code de vérification e-mail pour cette demande est: " + random + ". Veuillez compléter la vérification dans les 5 minutes");
+ email2_content.text("Le code de ramassage de votre colis est " + random + ", veuillez effectuer la verification dans les 5minutes.");
}
EmailUtil.send(userInfo.getEmail(), language == 1 ? "取件码" : language == 2 ? "Pickup code" : "Code de ramassage", document.html());
//开始生成pdf收据和html收据
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 df5f595..57ab844 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
@@ -1512,21 +1512,21 @@
DriverActivityRegistered driverActivityRegistered = driverActivityRegisteredMapper.selectById(dah.getActivityId());
activityWarpper.setId(driverActivityRegistered.getId());
activityWarpper.setContent(language == 1 ? "邀请司机注册奖励" + driverActivityRegistered.getMoney() + "元" :
- language == 2 ? "Invitation driver registration reward " + driverActivityRegistered.getMoney() + " yuan" :
- "Invitation pilote inscription récompense " + driverActivityRegistered.getMoney() + " yuan");
+ 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 ? "邀请用户注册奖励" + driverActivityRegistered1.getMoney() + "元" :
- language == 2 ? "Invite users to register and reward " + driverActivityRegistered1.getMoney() + " yuan" :
- "Bonus de " + driverActivityRegistered1.getMoney() + " $pour les utilisateurs invités à s’inscrire");
+ 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 " : " aujourd’hui ");
+ 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()), 0);
Integer hour = 0;
if(null != query){
@@ -1534,7 +1534,7 @@
}
switch (driverActivityOnline.getType()){
case 1:
- sb.append(language == 1 ? "打车" : language == 2 ? "Ride" : "Course");
+ sb.append(language == 1 ? "打车" : language == 2 ? "ride" : "de course");
break;
case 2:
sb.append("出租车");
@@ -1543,12 +1543,12 @@
sb.append("城际出行");
continue;
case 4:
- sb.append(language == 1 ? "包裹" : language == 2 ? "Package" : "Livraison");
+ sb.append(language == 1 ? "包裹" : language == 2 ? "package" : "de colis");
break;
}
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";
+ 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;
@@ -1556,8 +1556,8 @@
DriverActivityOrder driverActivityOrder = driverActivityOrderMapper.selectById(dah.getActivityId());
activityWarpper.setId(driverActivityOrder.getId());
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");
+ 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("H:m");
Date start = sdf.parse(driverActivityOrder.getStart());
Date end = sdf.parse(driverActivityOrder.getEnd());
diff --git a/DriverIGOTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java b/DriverIGOTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java
index 23eea93..0786065 100644
--- a/DriverIGOTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java
+++ b/DriverIGOTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java
@@ -1,31 +1,31 @@
-//package com.stylefeng.guns;
-//
-//import com.stylefeng.guns.modular.system.service.IOrderEvaluateService;
-//import org.junit.Test;
-//import org.junit.runner.RunWith;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.boot.test.context.SpringBootTest;
-//import org.springframework.test.context.junit4.SpringRunner;
-//
-//import java.util.Map;
-//
-///**
-// * @author zhibing.pu
-// * @Date 2023/12/5 11:22
-// */
-//@RunWith(SpringRunner.class)
-//@SpringBootTest
-//public class GunsApplicationTest {
-//
-// @Autowired
-// private IOrderEvaluateService orderEvaluateService;
-//
-// @Test
-// public void test(){
-// try {
-// Map<String, Object> map = orderEvaluateService.queryEvaluate(3, 1, 10, 2508);
-// }catch (Exception e){
-// e.printStackTrace();
-// }
-// }
-//}
+package com.stylefeng.guns;
+
+import com.stylefeng.guns.modular.system.service.IOrderEvaluateService;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.Map;
+
+/**
+ * @author zhibing.pu
+ * @Date 2023/12/5 11:22
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class GunsApplicationTest {
+
+ @Autowired
+ private IOrderEvaluateService orderEvaluateService;
+
+ @Test
+ public void test(){
+ try {
+ Map<String, Object> map = orderEvaluateService.queryEvaluate(3, 1, 10, 2508);
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+}
--
Gitblit v1.7.1