From 4c99ee7028c3fe58a2cd4b8273b22c75c45574fc Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 16 五月 2025 10:27:41 +0800
Subject: [PATCH] 修改文档bug
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 189 ++++++++++++++++++++++++----------------------
1 files changed, 99 insertions(+), 90 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 8c6090c..bd8cfd1 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
@@ -1,5 +1,6 @@
package com.stylefeng.guns.modular.specialTrain.server.impl;
+import cn.hutool.db.nosql.redis.RedisDS;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
@@ -59,6 +60,7 @@
import java.math.RoundingMode;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@@ -147,7 +149,7 @@
@Resource
private IUserActivityRedenvelopeService userActivityRedenvelopeService;
-
+
@Resource
private RedisUtil redisUtil;
@@ -311,7 +313,7 @@
orderPrivateCar.setPassengers(name);
orderPrivateCar.setPassengersPhone(phone);
if(instead == 0 || ToolUtil.isEmpty(orderPrivateCar.getPassengers())){
- orderPrivateCar.setPassengers(userInfo.getFirstName() + "." + userInfo.getLastName());
+ orderPrivateCar.setPassengers(ToolUtil.isNotEmpty(userInfo.getFirstName()) ? userInfo.getFirstName() + "." + userInfo.getLastName() : "");
orderPrivateCar.setPassengersPhone(userInfo.getPhone());
}
orderPrivateCar.setState(1);
@@ -374,6 +376,7 @@
orderPrivateCar.setIsReassign(1);
orderPrivateCar.setIsDelete(1);
orderPrivateCar.setTripId(tripId);
+ orderPrivateCar.setIsover(0);
DistancematrixVo distancematrix1 = GoogleMapUtil.getDistancematrix(orderPrivateCar.getStartLat(), orderPrivateCar.getStartLon(), orderPrivateCar.getEndLat(), orderPrivateCar.getEndLon(), tripId);
Long distance1 = distancematrix1.getDistance();
orderPrivateCar.setEstimatedMileage(new BigDecimal(distance1).divide(new BigDecimal(1000)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
@@ -500,8 +503,8 @@
new Thread(new Runnable() {
@Override
public void run() {
- pushUtil.pushOrderState(1, uid, orderPrivateCar.getId(), 1, 2, 0, "");
- pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, 2, 0, finalAudioUrl);
+ pushUtil.pushOrderState(1, uid, orderPrivateCar.getId(), 1, 2, 0, "", "user");
+ pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, 2, 0, finalAudioUrl, "user");
}
}).start();
}
@@ -635,8 +638,8 @@
new Thread(new Runnable() {
@Override
public void run() {
- pushUtil.pushOrderState(1, uid, orderPrivateCar.getId(), 1, 2, 0, "");
- pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, 2, 0, finalAudioUrl);
+ pushUtil.pushOrderState(1, uid, orderPrivateCar.getId(), 1, 2, 0, "", "user");
+ pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, 2, 0, finalAudioUrl, "user");
}
}).start();
}
@@ -729,7 +732,10 @@
BaseWarpper baseWarpper = new BaseWarpper();
double amount = 0;
CancleOrder query = cancleOrderService.query(orderPrivateCar.getCompanyId());
- if(null == query || null == orderPrivateCar.getDriverId() || orderPrivateCar.getState() == 11){
+ if(null == query){
+ return ResultUtil.error("请先添加取消规则");
+ }
+ if(null == orderPrivateCar.getDriverId() || orderPrivateCar.getState() == 11){
baseWarpper.setAmount(amount);
return ResultUtil.success(baseWarpper);
}
@@ -911,8 +917,8 @@
}
break;
}
- pushUtil.pushOrderState(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0, "");
- pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState() == 12 ? orderPrivateCar.getState() : 10, 0, audioUrl);
+ pushUtil.pushOrderState(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0, "", "user");
+ pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState() == 12 ? orderPrivateCar.getState() : 10, 0, audioUrl, "user");
System.err.println("推送取消操作---------------------");
}
}).start();
@@ -1078,11 +1084,11 @@
}
this.deleteTask(id);//删除定时任务
- pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0, "");
+ pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0, "", "user");
}else{
incomeService.saveData(1, orderPrivateCar.getCompanyId(), 3, orderPrivateCar.getId(), 1, amount.doubleValue());
}
- pushUtil.pushOrderState(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0, "");
+ pushUtil.pushOrderState(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0, "", "user");
//添加消息
systemNoticeService.addSystemNotice(1, language == 1 ? "您已使用余额成功支付取消订单费用，谢谢使用！" : language == 2
@@ -1184,7 +1190,7 @@
}
}, 30000);
- pushUtil.pushOrderState(2, driver.getId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), pushOrder.getPushTime(), audioUrl);
+ pushUtil.pushOrderState(2, driver.getId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), pushOrder.getPushTime(), audioUrl, "user");
}
}
Thread.sleep(pushOrder.getPushTime() * 1000);//设置等待时间
@@ -1297,7 +1303,7 @@
ResultUtil resultUtil = ResultUtil.success("");
orderPrivateCar.setCouponMoney(0D);//初始化历史数据
orderPrivateCar.setCouponId(null);
-
+
//计算折扣
UserActivityDiscount1 query2 = userActivityDiscount1Mapper.query(orderPrivateCar.getCompanyId());
if(null != query2){
@@ -1316,7 +1322,7 @@
}
}
}
-
+
//计算优惠券
UserCouponRecord userCouponRecord = null;
if(null != couponId){
@@ -1343,7 +1349,7 @@
orderPrivateCar.setCouponMoney(userCouponRecord.getMoney());
orderPrivateCar.setCouponId(couponId);
}
-
+
//计算红包
if(null != redDeduction && 1 == redDeduction && null == orderPrivateCar.getRedPacketId()){
RedEnvelopePaymentSettings redEnvelopePaymentSettings = redEnvelopePaymentSettingsService.getRedEnvelopePaymentSettings();
@@ -1356,14 +1362,14 @@
if(total > 0 && multiply1.doubleValue() > 0 && total.compareTo(multiply1.doubleValue()) >= 0){
orderPrivateCar.setRedPacketMoney(multiply1.doubleValue());
orderMoney = orderMoney.subtract(multiply1).setScale(2, RoundingMode.HALF_EVEN);
-
+
//获取红包id
JSONArray jsonArray = new JSONArray();
for (UserRedPacketRecord userRedPacketRecord : userRedPacketRecords) {
JSONObject jsonObject = new JSONObject();
jsonObject.put("id", userRedPacketRecord.getId());
BigDecimal remainingAmount = new BigDecimal(userRedPacketRecord.getRemainingAmount());
-
+
if(multiply1.compareTo(remainingAmount) >= 0){
userRedPacketRecord.setRemainingAmount(0D);
userRedPacketRecord.setEndTime(new Date());
@@ -1393,7 +1399,7 @@
jsonObject.put("id", userRedPacketRecord.getId());
jsonObject.put("money", userRedPacketRecord.getRemainingAmount());
jsonArray.add(jsonObject);
-
+
userRedPacketRecord.setRemainingAmount(0D);
userRedPacketRecord.setEndTime(new Date());
userRedPacketRecord.setState(2);
@@ -1405,8 +1411,8 @@
}
}
}
-
-
+
+
if(payType == 1){//手机支付
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
String merchantTransactionId = sdf.format(new Date()) + "1" + language + orderId;
@@ -1424,14 +1430,14 @@
checkoutRequest.setSuccessRedirectUrl("https://igo.i-go.group/payMoney/pages/success.html");
checkoutRequest.setFailRedirectUrl("https://igo.i-go.group/payMoney/pages/fail.html");
resultUtil = TinggPayUtil.checkoutRequest(checkoutRequest);
-
+
if(resultUtil.getCode()==200){
paymentRecordService.saveData(1, null, null, orderId, 1, 1,
orderMoney.setScale(2, RoundingMode.HALF_EVEN).doubleValue(), null, 1);//添加预支付数据
}else{
resultUtil = ResultUtil.error(language == 1 ? "支付失败" : language == 2 ? "Payment failure" : "Paiement échoué", "");
}
-
+
}
if(payType == 2){//银行卡支付
BankCard bankCard = bankCardService.selectById(bankCardId);
@@ -1451,7 +1457,7 @@
checkoutRequest.setSuccessRedirectUrl("https://igo.i-go.group/payMoney/pages/success.html");
checkoutRequest.setFailRedirectUrl("https://igo.i-go.group/payMoney/pages/fail.html");
resultUtil = TinggPayUtil.checkoutRequest(checkoutRequest);
-
+
if(resultUtil.getCode()==200){
paymentRecordService.saveData(1, null, null, orderId, 1, 2,
orderMoney.setScale(2, RoundingMode.HALF_EVEN).doubleValue(), null, 1);//添加预支付数据
@@ -1463,28 +1469,28 @@
if(userInfo.getBalance() == null || new BigDecimal(userInfo.getBalance()).compareTo(orderMoney) < 0){
return ResultUtil.error(language == 1 ? "账户余额不足" : language == 2 ? "Insufficient balance" : "Solde insuffisant", "");
}
-
+
userInfo.setBalance(new BigDecimal(userInfo.getBalance()).subtract(orderMoney).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
-
+
SysIntegral query1 = sysIntegralMapper.query(orderPrivateCar.getCompanyId());
userInfo.setIntegral(userInfo.getIntegral() + (orderMoney.intValue() * query1.getIntegral()));//积分
-
+
//添加交易明细
transactionDetailsService.saveData(uid, "完成订单", orderMoney.setScale(2, RoundingMode.HALF_EVEN).doubleValue(),
2, 1, 1, 1, orderId);
userInfoService.updateById(userInfo);
-
+
orderPrivateCar.setState(8);
orderPrivateCar.setPayType(3);
orderPrivateCar.setPayMoney(orderMoney.setScale(2, RoundingMode.HALF_EVEN).doubleValue());
-
+
//处理优惠券和红包
if(null != userCouponRecord){
userCouponRecord.setState(2);
userCouponRecord.setEndTime(new Date());
userCouponRecordService.updateById(userCouponRecord);
}
-
+
//添加已收入明细
Company company = companyService.selectById(orderPrivateCar.getCompanyId());
Double speMoney = company.getSpeMoney();
@@ -1506,7 +1512,7 @@
driver.setLaveBusinessMoney(new BigDecimal(null != driver.getLaveBusinessMoney() ? driver.getLaveBusinessMoney() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
driver.setBalance(new BigDecimal(null != driver.getBalance() ? driver.getBalance() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
driverService.updateById(driver);
-
+
if(ToolUtil.isNotEmpty(userInfo.getEmail())){
new Thread(new Runnable() {
@Override
@@ -1524,6 +1530,7 @@
aDouble = orderEvaluateService.queryDriverScore(orderPrivateCar.getDriverId());
}
Double aDouble1 = new BigDecimal(orderPrivateCar.getMileage()).divide(new BigDecimal(1000)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ Long serviceTime = new BigDecimal(orderPrivateCar.getEndServiceTime().getTime() - orderPrivateCar.getStartServiceTime().getTime()).divide(new BigDecimal(60000)).setScale(0, RoundingMode.HALF_EVEN).longValue();
if(1 == language){
document.getElementById("english").remove();
document.getElementById("french").remove();
@@ -1605,7 +1612,7 @@
Element lost_item_chinese = document.getElementById("lost_item_chinese");
lost_item_chinese.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=1");
Element track_chinese = document.getElementById("track_chinese");
- track_chinese.attr("href", "https://igo.i-go.group/mailbox/user/location.html?orderId=" + orderId);
+ track_chinese.attr("href", "https://igo.i-go.group/mailbox/user/location.html?orderId=" + orderId + "&language=" + language);
Element pay_time_chinese = document.getElementById("pay_time_chinese");
pay_time_chinese.text(DateUtil.conversionFormat(language, sdf1.format(orderPrivateCar.getEndServiceTime())));
Elements driver_chinese = document.getElementsByClass("driver_chinese");
@@ -1618,7 +1625,7 @@
Element pf_chinese = document.getElementById("pf_chinese");
pf_chinese.text("司机评分：" + aDouble);
Element lc_chinese = document.getElementById("lc_chinese");
- lc_chinese.text("里程：" + aDouble1 + "公里 /" + orderPrivateCar.getDuration() + "分钟");
+ lc_chinese.text("里程：" + aDouble1 + "公里 /" + serviceTime + "分钟");
Element start_time_chinese = document.getElementById("start_time_chinese");
start_time_chinese.text(sdf2.format(orderPrivateCar.getTravelTime()));
Element start_address_chinese = document.getElementById("start_address_chinese");
@@ -1712,7 +1719,7 @@
Element lost_item_english = document.getElementById("lost_item_english");
lost_item_english.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=1");
Element track_english = document.getElementById("track_english");
- track_english.attr("href", "https://igo.i-go.group/mailbox/user/location.html?orderId=" + orderId);
+ track_english.attr("href", "https://igo.i-go.group/mailbox/user/location.html?orderId=" + orderId + "&language=" + language);
Element pay_time_english = document.getElementById("pay_time_english");
pay_time_english.text(DateUtil.conversionFormat(language, sdf1.format(orderPrivateCar.getEndServiceTime())));
Elements driver_english = document.getElementsByClass("driver_english");
@@ -1725,7 +1732,7 @@
Element pf_english = document.getElementById("pf_english");
pf_english.text("Driver Rating：" + aDouble);
Element lc_english = document.getElementById("lc_english");
- lc_english.text("Mileage：" + aDouble1 + "KM / " + orderPrivateCar.getDuration() + "Minutes");
+ lc_english.text("Mileage：" + aDouble1 + "KM / " + serviceTime + "Minutes");
Element start_time_english = document.getElementById("start_time_english");
start_time_english.text(sdf2.format(orderPrivateCar.getTravelTime()));
Element start_address_english = document.getElementById("start_address_english");
@@ -1819,7 +1826,7 @@
Element lost_item_french = document.getElementById("lost_item_french");
lost_item_french.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=1");
Element track_french = document.getElementById("track_french");
- track_french.attr("href", "https://igo.i-go.group/mailbox/user/location.html?orderId=" + orderId);
+ track_french.attr("href", "https://igo.i-go.group/mailbox/user/location.html?orderId=" + orderId + "&language=" + language);
Element pay_time_french = document.getElementById("pay_time_french");
pay_time_french.text(DateUtil.conversionFormat(language, sdf1.format(orderPrivateCar.getEndServiceTime())));
Elements driver_french = document.getElementsByClass("driver_french");
@@ -1832,7 +1839,7 @@
Element pf_french = document.getElementById("pf_french");
pf_french.text("Note du chauffeur: " + aDouble);
Element lc_french = document.getElementById("lc_french");
- lc_french.text("Distance: " + aDouble1 + "km / " + orderPrivateCar.getDuration() + "minutes");
+ lc_french.text("Distance: " + aDouble1 + "km / " + serviceTime + "minutes");
Element start_time_french = document.getElementById("start_time_french");
start_time_french.text(sdf2.format(orderPrivateCar.getTravelTime()));
Element start_address_french = document.getElementById("start_address_french");
@@ -1846,7 +1853,7 @@
server_tel_french.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
}
EmailUtil.send(userInfo.getEmail(), language == 1 ? "打车收据" : language == 2 ? "Ride receipt" : "Reçu de course", document.html());
-
+
//开始生成pdf收据和html收据
File file = new File("/home/igotechgh/nginx/html/files/html/");
if(!file.exists()){
@@ -1860,7 +1867,7 @@
fileWriter.write(document.html());
fileWriter.flush();
fileWriter.close();
-
+
File file1 = new File("/home/igotechgh/nginx/html/files/pdf/");
if(!file1.exists()){
file1.mkdirs();
@@ -1876,7 +1883,7 @@
e.printStackTrace();
System.out.println("html转pdf异常");
}
-
+
String link ="https://igo.i-go.group/files/html/ride_receipt_" + orderId + ".html";
TEmail tEmail = new TEmail();
tEmail.setLink(link);
@@ -1894,27 +1901,27 @@
tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
}
emailService.insert(tEmail);
-
-
-
+
+
+
}catch (Exception e){
e.printStackTrace();
}
}
}).start();
}
-
-
-
+
+
+
// TODO: 2020/5/24 这里需要给司机和用户推送订单状态
new Thread(new Runnable() {
@Override
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.pushOrderState(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0, "", "user");
+ pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0, "", "user");
}
}).start();
-
+
systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功完成出行订单支付，谢谢使用！" : language == 2
? "You've paid for the ride order successfully, thank you for using I-GO"
: "Vous avez payé la commande de course avec succès, merci d’utiliser I-GO", orderPrivateCar.getUserId(), 1);
@@ -1922,19 +1929,19 @@
if(payType == 4){//现金支付
SysIntegral query1 = sysIntegralMapper.query(orderPrivateCar.getCompanyId());
userInfo.setIntegral(userInfo.getIntegral() + (orderMoney.intValue() * query1.getIntegral()));//积分
-
+
//添加交易明细
transactionDetailsService.saveData(uid, "完成订单", orderMoney.setScale(2, RoundingMode.HALF_EVEN).doubleValue(),
2, 1, 1, 1, orderId);
userInfoService.updateById(userInfo);
-
+
orderPrivateCar.setState(8);
orderPrivateCar.setPayType(4);
orderPrivateCar.setDriverPay(2);
orderPrivateCar.setPayMoney(orderMoney.setScale(2, RoundingMode.HALF_EVEN).doubleValue());
-
+
Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
-
+
//处理优惠券和红包
if(null != userCouponRecord){
userCouponRecord.setState(2);
@@ -1948,7 +1955,7 @@
driver.setBalance(new BigDecimal(null != driver.getBalance() ? driver.getBalance() : 0).add(new BigDecimal(money)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
driverService.updateById(driver);
}
-
+
if(null != orderPrivateCar.getRedPacketId()){
Double money = orderPrivateCar.getRedPacketMoney();
incomeService.saveData(2, orderPrivateCar.getDriverId(), 7, orderPrivateCar.getId(), 1, money);
@@ -1957,7 +1964,7 @@
driver.setBalance(new BigDecimal(null != driver.getBalance() ? driver.getBalance() : 0).add(new BigDecimal(money)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
driverService.updateById(driver);
}
-
+
if(null != orderPrivateCar.getDiscountMoney() && 0 < orderPrivateCar.getDiscountMoney()){
Double money = orderPrivateCar.getDiscountMoney();
incomeService.saveData(2, orderPrivateCar.getDriverId(), 6, orderPrivateCar.getId(), 1, money);
@@ -1966,8 +1973,8 @@
driver.setBalance(new BigDecimal(null != driver.getBalance() ? driver.getBalance() : 0).add(new BigDecimal(money)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
driverService.updateById(driver);
}
-
-
+
+
//添加已收入明细
Company company = companyService.selectById(orderPrivateCar.getCompanyId());
Double speMoney = company.getSpeMoney();
@@ -1989,8 +1996,8 @@
// driver.setLaveBusinessMoney(new BigDecimal(null != driver.getLaveBusinessMoney() ? driver.getLaveBusinessMoney() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
// driver.setBalance(new BigDecimal(null != driver.getBalance() ? driver.getBalance() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
// driverService.updateById(driver);
-
-
+
+
//记录司机待结算金额
if(d.compareTo(new BigDecimal(0)) > 0){
SettlementDetail settlementDetail = new SettlementDetail();
@@ -2001,7 +2008,7 @@
settlementDetail.setPrice(d.doubleValue());
settlementDetail.setCreateTime(new Date());
settlementDetailService.insert(settlementDetail);
-
+
SettlementAllocation settlementAllocation = settlementAllocationService.selectOne(null);
if(null != settlementAllocation){
JSONObject jsonObject = JSON.parseObject(settlementAllocation.getContent());
@@ -2049,7 +2056,7 @@
car.setVehicleId(UUIDUtil.getRandomCode());
carService.updateById(car);
}
-
+
//司机下班，修改谷歌上的车辆信息
new Thread(()->{
try {
@@ -2097,7 +2104,7 @@
}
}
}
-
+
if(ToolUtil.isNotEmpty(userInfo.getEmail())){
new Thread(new Runnable() {
@Override
@@ -2114,6 +2121,7 @@
aDouble = orderEvaluateService.queryDriverScore(orderPrivateCar.getDriverId());
}
Double aDouble1 = new BigDecimal(orderPrivateCar.getMileage()).divide(new BigDecimal(1000)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ Long serviceTime = new BigDecimal(orderPrivateCar.getEndServiceTime().getTime() - orderPrivateCar.getStartServiceTime().getTime()).divide(new BigDecimal(60000)).setScale(0, RoundingMode.HALF_EVEN).longValue();
Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
if(1 == language){
document.getElementById("english").remove();
@@ -2196,7 +2204,7 @@
Element lost_item_chinese = document.getElementById("lost_item_chinese");
lost_item_chinese.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=1");
Element track_chinese = document.getElementById("track_chinese");
- track_chinese.attr("href", "https://igo.i-go.group/mailbox/user/location.html?orderId=" + orderId);
+ track_chinese.attr("href", "https://igo.i-go.group/mailbox/user/location.html?orderId=" + orderId + "&language=" + language);
Element pay_time_chinese = document.getElementById("pay_time_chinese");
pay_time_chinese.text(DateUtil.conversionFormat(language, sdf1.format(orderPrivateCar.getEndServiceTime())));
Elements driver_chinese = document.getElementsByClass("driver_chinese");
@@ -2209,7 +2217,7 @@
Element pf_chinese = document.getElementById("pf_chinese");
pf_chinese.text("司机评分：" + aDouble);
Element lc_chinese = document.getElementById("lc_chinese");
- lc_chinese.text("里程：" + aDouble1 + "公里 /" + orderPrivateCar.getDuration() + "分钟");
+ lc_chinese.text("里程：" + aDouble1 + "公里 /" + serviceTime + "分钟");
Element start_time_chinese = document.getElementById("start_time_chinese");
start_time_chinese.text(sdf2.format(orderPrivateCar.getTravelTime()));
Element start_address_chinese = document.getElementById("start_address_chinese");
@@ -2303,7 +2311,7 @@
Element lost_item_english = document.getElementById("lost_item_english");
lost_item_english.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=1");
Element track_english = document.getElementById("track_english");
- track_english.attr("href", "https://igo.i-go.group/mailbox/user/location.html?orderId=" + orderId);
+ track_english.attr("href", "https://igo.i-go.group/mailbox/user/location.html?orderId=" + orderId + "&language=" + language);
Element pay_time_english = document.getElementById("pay_time_english");
pay_time_english.text(DateUtil.conversionFormat(language, sdf1.format(orderPrivateCar.getEndServiceTime())));
Elements driver_english = document.getElementsByClass("driver_english");
@@ -2316,7 +2324,7 @@
Element pf_english = document.getElementById("pf_english");
pf_english.text("Driver Rating：" + aDouble);
Element lc_english = document.getElementById("lc_english");
- lc_english.text("Mileage：" + aDouble1 + "KM / " + orderPrivateCar.getDuration() + "Minutes");
+ lc_english.text("Mileage：" + aDouble1 + "KM / " + serviceTime + "Minutes");
Element start_time_english = document.getElementById("start_time_english");
start_time_english.text(sdf2.format(orderPrivateCar.getTravelTime()));
Element start_address_english = document.getElementById("start_address_english");
@@ -2410,7 +2418,7 @@
Element lost_item_french = document.getElementById("lost_item_french");
lost_item_french.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=1");
Element track_french = document.getElementById("track_french");
- track_french.attr("href", "https://igo.i-go.group/mailbox/user/location.html?orderId=" + orderId);
+ track_french.attr("href", "https://igo.i-go.group/mailbox/user/location.html?orderId=" + orderId + "&language=" + language);
Element pay_time_french = document.getElementById("pay_time_french");
pay_time_french.text(DateUtil.conversionFormat(language, sdf1.format(orderPrivateCar.getEndServiceTime())));
Elements driver_french = document.getElementsByClass("driver_french");
@@ -2423,7 +2431,7 @@
Element pf_french = document.getElementById("pf_french");
pf_french.text("Note du chauffeur: " + aDouble);
Element lc_french = document.getElementById("lc_french");
- lc_french.text("Distance: " + aDouble1 + "km / " + orderPrivateCar.getDuration() + "minutes");
+ lc_french.text("Distance: " + aDouble1 + "km / " + serviceTime + "minutes");
Element start_time_french = document.getElementById("start_time_french");
start_time_french.text(sdf2.format(orderPrivateCar.getTravelTime()));
Element start_address_french = document.getElementById("start_address_french");
@@ -2436,9 +2444,9 @@
Element server_tel_french = document.getElementById("server_tel_french");
server_tel_french.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
}
-
+
EmailUtil.send(userInfo.getEmail(), language == 1 ? "打车收据" : language == 2 ? "Ride receipt" : "Reçu de course", document.html());
-
+
//开始生成pdf收据和html收据
File file = new File("/home/igotechgh/nginx/html/files/html/");
if(!file.exists()){
@@ -2452,7 +2460,7 @@
fileWriter.write(document.html());
fileWriter.flush();
fileWriter.close();
-
+
File file1 = new File("/home/igotechgh/nginx/html/files/pdf/");
if(!file1.exists()){
file1.mkdirs();
@@ -2485,23 +2493,23 @@
tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
}
emailService.insert(tEmail);
-
-
+
+
}catch (Exception e){
e.printStackTrace();
}
}
}).start();
}
-
-
-
+
+
+
// TODO: 2020/5/24 这里需要给司机和用户推送订单状态
new Thread(new Runnable() {
@Override
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.pushOrderState(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0, "", "user");
+ pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0, "", "user");
Integer language1 = driver.getLanguage();
String text = "";
switch (language1){
@@ -2514,7 +2522,7 @@
case 3:
text = "Le client a choisi de payer en espèces, vous devez donc encaisser le paiement.Confirmez si vous avez reçu les frais pour cette commande : Espèces GHS " + orderPrivateCar.getPayMoney();
break;
-
+
}
String audioUrl = "";
String fileName = "offlinePayment" + orderPrivateCar.getDriverId() + UUIDUtil.getRandomCode(5) + ".mp3";
@@ -2548,12 +2556,12 @@
pushUtil.pushOfflinePayment(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, orderPrivateCar.getPayMoney(), audioUrl);
}
}).start();
-
+
systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功完成出行订单支付，谢谢使用！" : language == 2
? "You've paid for the ride order successfully, thank you for using I-GO"
: "Vous avez payé la commande de course avec succès, merci d’utiliser I-GO", orderPrivateCar.getUserId(), 1);
}
-
+
this.updateAllColumnById(orderPrivateCar);
return resultUtil;
}
@@ -2762,11 +2770,11 @@
}
this.deleteTask(orderPrivateCar.getId());//删除定时任务
- pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0, "");
+ pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0, "", "user");
}else{
incomeService.saveData(1, orderPrivateCar.getCompanyId(), 3, orderPrivateCar.getId(), 1, amount.doubleValue());
}
- pushUtil.pushOrderState(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0, "");
+ pushUtil.pushOrderState(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0, "", "user");
//添加消息
systemNoticeService.addSystemNotice(1, language == 1 ? "您已使用余额成功支付取消订单费用，谢谢使用！" : language == 2
@@ -2846,6 +2854,7 @@
aDouble = orderEvaluateService.queryDriverScore(orderPrivateCar.getDriverId());
}
Double aDouble1 = new BigDecimal(orderPrivateCar.getMileage()).divide(new BigDecimal(1000)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ Long serviceTime = new BigDecimal(orderPrivateCar.getEndServiceTime().getTime() - orderPrivateCar.getStartServiceTime().getTime()).divide(new BigDecimal(60000)).setScale(0, RoundingMode.HALF_EVEN).longValue();
if(1 == language){
document.getElementById("english").remove();
document.getElementById("french").remove();
@@ -2927,7 +2936,7 @@
Element lost_item_chinese = document.getElementById("lost_item_chinese");
lost_item_chinese.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + id + "&orderType=1");
Element track_chinese = document.getElementById("track_chinese");
- track_chinese.attr("href", "https://igo.i-go.group/mailbox/user/location.html?orderId=" + id);
+ track_chinese.attr("href", "https://igo.i-go.group/mailbox/user/location.html?orderId=" + id + "&language=" + language);
Element pay_time_chinese = document.getElementById("pay_time_chinese");
pay_time_chinese.text(DateUtil.conversionFormat(language, sdf1.format(orderPrivateCar.getEndServiceTime())));
Elements driver_chinese = document.getElementsByClass("driver_chinese");
@@ -2940,7 +2949,7 @@
Element pf_chinese = document.getElementById("pf_chinese");
pf_chinese.text("司机评分：" + aDouble);
Element lc_chinese = document.getElementById("lc_chinese");
- lc_chinese.text("里程：" + aDouble1 + "公里 /" + orderPrivateCar.getDuration() + "分钟");
+ lc_chinese.text("里程：" + aDouble1 + "公里 /" + serviceTime + "分钟");
Element start_time_chinese = document.getElementById("start_time_chinese");
start_time_chinese.text(sdf2.format(orderPrivateCar.getTravelTime()));
Element start_address_chinese = document.getElementById("start_address_chinese");
@@ -3034,7 +3043,7 @@
Element lost_item_english = document.getElementById("lost_item_english");
lost_item_english.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + id + "&orderType=1");
Element track_english = document.getElementById("track_english");
- track_english.attr("href", "https://igo.i-go.group/mailbox/user/location.html?orderId=" + id);
+ track_english.attr("href", "https://igo.i-go.group/mailbox/user/location.html?orderId=" + id + "&language=" + language);
Element pay_time_english = document.getElementById("pay_time_english");
pay_time_english.text(DateUtil.conversionFormat(language, sdf1.format(orderPrivateCar.getEndServiceTime())));
Elements driver_english = document.getElementsByClass("driver_english");
@@ -3047,7 +3056,7 @@
Element pf_english = document.getElementById("pf_english");
pf_english.text("Driver Rating：" + aDouble);
Element lc_english = document.getElementById("lc_english");
- lc_english.text("Mileage：" + aDouble1 + "KM / " + orderPrivateCar.getDuration() + "Minutes");
+ lc_english.text("Mileage：" + aDouble1 + "KM / " + serviceTime + "Minutes");
Element start_time_english = document.getElementById("start_time_english");
start_time_english.text(sdf2.format(orderPrivateCar.getTravelTime()));
Element start_address_english = document.getElementById("start_address_english");
@@ -3141,7 +3150,7 @@
Element lost_item_french = document.getElementById("lost_item_french");
lost_item_french.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + id + "&orderType=1");
Element track_french = document.getElementById("track_french");
- track_french.attr("href", "https://igo.i-go.group/mailbox/user/location.html?orderId=" + id);
+ track_french.attr("href", "https://igo.i-go.group/mailbox/user/location.html?orderId=" + id + "&language=" + language);
Element pay_time_french = document.getElementById("pay_time_french");
pay_time_french.text(DateUtil.conversionFormat(language, sdf1.format(orderPrivateCar.getEndServiceTime())));
Elements driver_french = document.getElementsByClass("driver_french");
@@ -3154,7 +3163,7 @@
Element pf_french = document.getElementById("pf_french");
pf_french.text("Note du chauffeur: " + aDouble);
Element lc_french = document.getElementById("lc_french");
- lc_french.text("Distance: " + aDouble1 + "km / " + orderPrivateCar.getDuration() + "minutes");
+ lc_french.text("Distance: " + aDouble1 + "km / " + serviceTime + "minutes");
Element start_time_french = document.getElementById("start_time_french");
start_time_french.text(sdf2.format(orderPrivateCar.getTravelTime()));
Element start_address_french = document.getElementById("start_address_french");
@@ -3231,8 +3240,8 @@
new Thread(new Runnable() {
@Override
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.pushOrderState(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0, "", "user");
+ pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0, "", "user");
}
}).start();
--
Gitblit v1.7.1