From 4bbaf65b485551c3c3d3561eaee6b782d242086d Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期四, 01 八月 2024 18:20:32 +0800
Subject: [PATCH] 修改2.0 bug
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 62 ++++++++++++++++++++-----------
1 files changed, 40 insertions(+), 22 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index d27b374..25f5f7b 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -247,8 +247,8 @@
if(orderPrivateCars.size() > 0){
return ResultUtil.error(language == 1 ? "有未完成的订单" : language == 2 ? "Uncompleted order(s)" : "Commande(s) non complétée(s)");
}
- List<OrderTaxi> list = orderTaxiMapper.queryByState_(uid, 1, 1, 1, 2, 3, 4, 5, 6, 11);
- if(list.size() > 0){
+ int i1 = orderLogisticsService.selectCount(new EntityWrapper<OrderLogistics>().eq("userId", uid).in("state", Arrays.asList(1, 2, 3, 4, 5, 6, 7, 11, 12)).eq("isDelete", 1));
+ if(i1 > 0){
return ResultUtil.error(language == 1 ? "有未完成的订单" : language == 2 ? "Uncompleted order(s)" : "Commande(s) non complétée(s)");
}
@@ -263,12 +263,6 @@
baseWarpper.setState(7);
baseWarpper.setId(orderPrivateCars.get(0).getId());
return ResultUtil.success(baseWarpper);
- }
-
-
- list = orderTaxiMapper.queryByState_(uid, 2, 1, 1, 2, 3, 4, 5, 6, 11);
- if(list.size() > 0 && reservation == 2){
- return ResultUtil.error(language == 1 ? "有未完成的订单" : language == 2 ? "Uncompleted order(s)" : "Commande(s) non complétée(s)");
}
startAddress = startAddress.replaceAll("& #40;", "(");
@@ -371,6 +365,9 @@
orderPrivateCar.setEstimatedMileage(new BigDecimal(distance1).divide(new BigDecimal(1000)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
this.insert(orderPrivateCar);
+ UserInfo userInfo = userInfoService.selectById(uid);
+ userInfo.setLanguage(language);
+ userInfoService.updateById(userInfo);
new Thread(() -> {
try {
@@ -416,8 +413,9 @@
}
String audioUrl = "";
+ String fileName = "pushOrder" + orderPrivateCar.getDriverId() + UUIDUtil.getRandomCode(5) + ".mp3";
try {
- audioUrl = TextToSpeechUtil.create(language1 == 1 ? "cmn-CN" : language1 == 2 ? "en-US" : "fr-FR", text, "pushOrder" + orderPrivateCar.getDriverId() + ".mp3");
+ audioUrl = TextToSpeechUtil.create(language1 == 1 ? "cmn-CN" : language1 == 2 ? "en-US" : "fr-FR", text, fileName);
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -427,7 +425,7 @@
public void run() {
Process process = null;
try {
- process = Runtime.getRuntime().exec("rm -rf /usr/local/nginx/html/files/audio/pushOrder" + orderPrivateCar.getDriverId() + ".mp3");
+ process = Runtime.getRuntime().exec("rm -rf /usr/local/nginx/html/files/audio/" + fileName);
} catch (IOException e) {
throw new RuntimeException(e);
}
@@ -528,8 +526,9 @@
}
String audioUrl = "";
+ String fileName = "pushOrder" + orderPrivateCar.getDriverId() + UUIDUtil.getRandomCode(5) + ".mp3";
try {
- audioUrl = TextToSpeechUtil.create(language1 == 1 ? "cmn-CN" : language1 == 2 ? "en-US" : "fr-FR", text, "pushOrder" + orderPrivateCar.getDriverId() + ".mp3");
+ audioUrl = TextToSpeechUtil.create(language1 == 1 ? "cmn-CN" : language1 == 2 ? "en-US" : "fr-FR", text, fileName);
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -539,7 +538,7 @@
public void run() {
Process process = null;
try {
- process = Runtime.getRuntime().exec("rm -rf /usr/local/nginx/html/files/audio/pushOrder" + orderPrivateCar.getDriverId() + ".mp3");
+ process = Runtime.getRuntime().exec("rm -rf /usr/local/nginx/html/files/audio/" + fileName);
} catch (IOException e) {
throw new RuntimeException(e);
}
@@ -750,7 +749,7 @@
if(null == orderPrivateCar){
return ResultUtil.error(language == 1 ? "取消订单失败，订单信息有误" : language == 2 ? "Failed to cancel order, order-information error." : "Échec de l’annulation de la commande, erreur d’information de commande.");
}
- if(orderPrivateCar.getState() > 5 && orderPrivateCar.getState() != 11){
+ if(orderPrivateCar.getState() > 5 && orderPrivateCar.getState() != 12){
return ResultUtil.error(language == 1 ? "取消订单失败，不合法的操作" : language == 2 ? "Failed to cancel order, illegal operation." : "Échec de l’annulation de la commande, opération illégale.");
}
@@ -816,13 +815,25 @@
String audioUrl = "";
switch (language1){
case 1:
- audioUrl = "http://182.160.16.251:81/files/audio/UserCancelledOrder-CN.mp3";
+ if(orderPrivateCar.getState() == 6){
+ audioUrl = "http://182.160.16.251:81/files/audio/system/MidwayCancellation-CN.mp3";
+ }else{
+ audioUrl = "http://182.160.16.251:81/files/audio/system/UserCancelledOrder-CN.mp3";
+ }
break;
case 2:
- audioUrl = "http://182.160.16.251:81/files/audio/UserCancelledOrder-EN.mp3";
+ if(orderPrivateCar.getState() == 6){
+ audioUrl = "http://182.160.16.251:81/files/audio/system/MidwayCancellation-EN.mp3";
+ }else{
+ audioUrl = "http://182.160.16.251:81/files/audio/system/UserCancelledOrder-EN.mp3";
+ }
break;
case 3:
- audioUrl = "http://182.160.16.251:81/files/audio/UserCancelledOrder-FR.mp3";
+ if(orderPrivateCar.getState() == 6){
+ audioUrl = "http://182.160.16.251:81/files/audio/system/MidwayCancellation-FR.mp3";
+ }else{
+ audioUrl = "http://182.160.16.251:81/files/audio/system/UserCancelledOrder-FR.mp3";
+ }
break;
}
pushUtil.pushOrderState(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0, "");
@@ -1052,8 +1063,9 @@
}
String audioUrl = "";
+ String fileName = "pushOrder" + orderPrivateCar.getDriverId() + UUIDUtil.getRandomCode(5) + ".mp3";
try {
- audioUrl = TextToSpeechUtil.create(language == 1 ? "cmn-CN" : language == 2 ? "en-US" : "fr-FR", text, "pushOrder" + orderPrivateCar.getDriverId() + ".mp3");
+ audioUrl = TextToSpeechUtil.create(language == 1 ? "cmn-CN" : language == 2 ? "en-US" : "fr-FR", text, fileName);
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -1063,7 +1075,7 @@
public void run() {
Process process = null;
try {
- process = Runtime.getRuntime().exec("rm -rf /usr/local/nginx/html/files/audio/pushOrder" + orderPrivateCar.getDriverId() + ".mp3");
+ process = Runtime.getRuntime().exec("rm -rf /usr/local/nginx/html/files/audio/" + fileName);
} catch (IOException e) {
throw new RuntimeException(e);
}
@@ -2093,7 +2105,7 @@
public void run() {
pushUtil.pushOrderState(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0, "");
pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0, "");
- pushUtil.pushOfflinePayment(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1);
+ pushUtil.pushOfflinePayment(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, orderPrivateCar.getPayMoney());
}
}).start();
@@ -2752,6 +2764,11 @@
if(state == 11){
map.put("state", map.get("oldState"));
}
+ if(state == 12){
+ OrderCancel query = orderCancelService.query(orderId, 1, null, null, 1);
+ map.put("cancelPayMoney", null == query ? 0 : query.getMoney());
+ map.put("cancelMoney", null == query ? 0 : query.getMoney());
+ }
if(Integer.valueOf(String.valueOf(map.get("state"))) != 8 && Integer.valueOf(String.valueOf(map.get("state"))) != 9){
map.put("redPacketMoney", null);
map.put("couponMoney", null);
@@ -2762,6 +2779,7 @@
Integer orderNum=this.selectCount(new EntityWrapper<OrderPrivateCar>().eq("userId",orderPrivateCar.getUserId()).eq("activityId",query2.getId()).last(" and to_days(getoffTime) = to_days(now())"));
if(query2.getDistance()*1000>orderPrivateCar.getMileage() && query2.getOrderNum()>orderNum){
Double special = query2.getSpecial();
+ map.put("discount", special);
orderPrivateCar.setDiscount(special);
Double orderMoney = orderPrivateCar.getOrderMoney();
double v = new BigDecimal(orderMoney).multiply(new BigDecimal(special / 10)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
@@ -2990,13 +3008,13 @@
String audioUrl = "";
switch (language1){
case 1:
- audioUrl = "http://182.160.16.251:81/files/audio/ChangeAddress-CN.mp3";
+ audioUrl = "http://182.160.16.251:81/files/audio/system/ChangeAddress-CN.mp3";
break;
case 2:
- audioUrl = "http://182.160.16.251:81/files/audio/ChangeAddress-EN.mp3";
+ audioUrl = "http://182.160.16.251:81/files/audio/system/ChangeAddress-EN.mp3";
break;
case 3:
- audioUrl = "http://182.160.16.251:81/files/audio/ChangeAddress-FR.mp3";
+ audioUrl = "http://182.160.16.251:81/files/audio/system/ChangeAddress-FR.mp3";
break;
}
pushUtil.pushModifyAddress(2, orderPrivateCar.getDriverId(), orderId, 1, 1, audioUrl);
--
Gitblit v1.7.1