From 5228e24ff93fae148db40c44d9deb8e93110c6eb Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 14 二月 2025 17:16:21 +0800
Subject: [PATCH] 开发新增加功能
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java | 2187 ++++++++++++++++++++++++++++++++--------------------------
1 files changed, 1,195 insertions(+), 992 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
index 2c2ce0b..0985a8a 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
@@ -41,12 +41,15 @@
import org.jsoup.nodes.Element;
import org.jsoup.nodes.FormElement;
import org.jsoup.select.Elements;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import org.springframework.util.StringUtils;
@@ -59,10 +62,13 @@
import java.math.RoundingMode;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.stream.Collectors;
@Service
public class OrderLogisticsServiceImpl extends ServiceImpl<OrderLogisticsMapper, OrderLogistics> implements IOrderLogisticsService {
+
+ private Logger log = LoggerFactory.getLogger(OrderLogisticsServiceImpl.class);
@Resource
private SystemPriceMapper systemPriceMapper;
@@ -413,47 +419,47 @@
* @return
* @throws Exception
*/
- public ResultUtil<Map<String, Double>> getPrice(Integer uid, Integer type, String startLon, String startLat, String endLon, String endLat) throws Exception{
- Company query = companyCityService.query1(uid, startLon, startLat);
- if(null == query){
- return ResultUtil.error("预约取货点暂无企业服务");
- }
- Double price1 = 0D;
- Double price2 = 0D;
- if(type == 4){//同城
- Map<String, Object> query1 = systemPriceMapper.query(query.getId(), type, null);
- Map<String, String> distance = gdMapElectricFenceUtil.getDistance(startLon + "," + startLat, endLon + "," + endLat, 1);
- String content = String.valueOf(query1.get("content"));
- JSONObject jsonObject = JSON.parseObject(content);
- String distance1 = distance.get("distance");
- Double dist = Double.valueOf(distance1) / 1000;
- if(dist.compareTo(0D) >= 0 && dist.compareTo(jsonObject.getDouble("num1")) < 0){
- price1 = jsonObject.getDouble("num2");
- }
-
- if(dist.compareTo(jsonObject.getDouble("num3")) >= 0 && dist.compareTo(jsonObject.getDouble("num4")) < 0){
- price1 = jsonObject.getDouble("num5");
- }
-
- if(dist.compareTo(jsonObject.getDouble("num6")) >= 0 && dist.compareTo(jsonObject.getDouble("num7")) < 0){
- price1 = jsonObject.getDouble("num8");
- }
-
- if(dist.compareTo(jsonObject.getDouble("num9")) >= 0 && dist.compareTo(jsonObject.getDouble("num10")) < 0){
- price1 = jsonObject.getDouble("num11");
- }
- }else{
- Map<String, Object> query1 = systemPriceMapper.query(query.getId(), type, null);
- String content = String.valueOf(query1.get("content"));
- JSONObject jsonObject = JSON.parseObject(content);
- price1 = jsonObject.getDouble("num1");
- price2 = jsonObject.getDouble("num2");
- }
- Map<String, Double> map = new HashMap<>();
- map.put("ordinary", price1);//普通
- map.put("precious", price2);//贵重
- return ResultUtil.success(map);
- }
+// public ResultUtil<Map<String, Double>> getPrice(Integer uid, Integer type, String startLon, String startLat, String endLon, String endLat) throws Exception{
+// Company query = companyCityService.query1(uid, startLon, startLat);
+// if(null == query){
+// return ResultUtil.error("预约取货点暂无企业服务");
+// }
+// Double price1 = 0D;
+// Double price2 = 0D;
+// if(type == 4){//同城
+// Map<String, Object> query1 = systemPriceMapper.query(query.getId(), type, null);
+// Map<String, String> distance = gdMapElectricFenceUtil.getDistance(startLon + "," + startLat, endLon + "," + endLat, 1);
+// String content = String.valueOf(query1.get("content"));
+// JSONObject jsonObject = JSON.parseObject(content);
+// String distance1 = distance.get("distance");
+// Double dist = Double.valueOf(distance1) / 1000;
+// if(dist.compareTo(0D) >= 0 && dist.compareTo(jsonObject.getDouble("num1")) < 0){
+// price1 = jsonObject.getDouble("num2");
+// }
+//
+// if(dist.compareTo(jsonObject.getDouble("num3")) >= 0 && dist.compareTo(jsonObject.getDouble("num4")) < 0){
+// price1 = jsonObject.getDouble("num5");
+// }
+//
+// if(dist.compareTo(jsonObject.getDouble("num6")) >= 0 && dist.compareTo(jsonObject.getDouble("num7")) < 0){
+// price1 = jsonObject.getDouble("num8");
+// }
+//
+// if(dist.compareTo(jsonObject.getDouble("num9")) >= 0 && dist.compareTo(jsonObject.getDouble("num10")) < 0){
+// price1 = jsonObject.getDouble("num11");
+// }
+// }else{
+// Map<String, Object> query1 = systemPriceMapper.query(query.getId(), type, null);
+// String content = String.valueOf(query1.get("content"));
+// JSONObject jsonObject = JSON.parseObject(content);
+// price1 = jsonObject.getDouble("num1");
+// price2 = jsonObject.getDouble("num2");
+// }
+// Map<String, Double> map = new HashMap<>();
+// map.put("ordinary", price1);//普通
+// map.put("precious", price2);//贵重
+// return ResultUtil.success(map);
+// }
@@ -469,7 +475,7 @@
Double discountMoney = 0D;
Integer activityId = null;
if(type == 4){//同城
- Map<String, Object> query1 = systemPriceMapper.query(query.getId(), type, null);
+ Map<String, Object> query1 = systemPriceMapper.query(query.getId(), type, null, language);
String tripId = redisUtil.getValue("trip" + uid);
DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(Double.valueOf(startLat), Double.valueOf(startLon), Double.valueOf(endLat), Double.valueOf(endLon), tripId);
if(null == distancematrix){
@@ -498,7 +504,7 @@
return ResultUtil.error(language == 1 ? "超出可服务范围" : language == 2 ? "Beyond service range" : "Au-delà de la portée de service");
}
}else{
- Map<String, Object> query1 = systemPriceMapper.query(query.getId(), type, null);
+ Map<String, Object> query1 = systemPriceMapper.query(query.getId(), type, null, language);
String content = String.valueOf(query1.get("content"));
JSONObject jsonObject = JSON.parseObject(content);
price1 = jsonObject.getDouble("num1");
@@ -596,14 +602,21 @@
new Timer().schedule(new TimerTask() {
@Override
public void run() {
- Process process = null;
try {
- process = Runtime.getRuntime().exec("sudo rm -rf /home/igotechgh/nginx/html/files/audio/" + fileName);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- if (process != null) {
- process.destroy();
+ // 使用Runtime执行命令
+ Process process = Runtime.getRuntime().exec("sudo rm -rf /home/igotechgh/nginx/html/files/audio/" + fileName);
+ // 读取命令的输出
+ BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
+ String line;
+ while ((line = reader.readLine()) != null) {
+ System.out.println(line);
+ }
+ // 等待命令执行完成
+ process.waitFor();
+ // 关闭流
+ reader.close();
+ } catch (IOException | InterruptedException e) {
+ e.printStackTrace();
}
}
}, 30000);
@@ -761,34 +774,75 @@
UserInfo userInfo = userInfoService.selectById(uid);
userInfo.setLanguage(language);
userInfoService.updateById(userInfo);
-
- new Thread(() -> {
- try {
- String vehicleId = null;
- if(null != orderLogistics.getDriverId()){
- Driver driver = driverService.selectById(orderLogistics.getDriverId());
- Car car = carMapper.selectById(driver.getCarId());
- if(!StringUtils.hasLength(car.getVehicleId())){
- car.setVehicleId(UUIDUtil.getRandomCode());
- carMapper.updateById(car);
- }
- //查询车辆信息，没有则创建信息
- String vehicles = fleetEngineUtil.getVehicles(car.getVehicleId());
- if(ToolUtil.isEmpty(vehicles)){
- CarModel carModel = carModelMapper.selectById(car.getCarModelId());
- fleetEngineUtil.createVehicles(carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
- fleetEngineUtil.updateVehicles("ONLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
- }
-
- }
- //创建行程数据
- fleetEngineUtil.createTrip(vehicleId, 1, orderLogistics.getTripId(),
- orderLogistics.getStartLat().toString(), orderLogistics.getStartLon().toString(), orderLogistics.getEndLat().toString(), orderLogistics.getEndLon().toString());
- }catch (Exception e){
- e.printStackTrace();
+ //google创建车辆信息
+ String vehicleId = null;
+ if(null != orderLogistics.getDriverId()){
+ Driver driver = driverService.selectById(orderLogistics.getDriverId());
+ Car car = carMapper.selectById(driver.getCarId());
+ if(!StringUtils.hasLength(car.getVehicleId())){
+ car.setVehicleId(UUIDUtil.getRandomCode());
+ carMapper.updateById(car);
}
- }).start();
+ //查询车辆信息，没有则创建信息
+ String vehicles = fleetEngineUtil.getVehicles(car.getVehicleId());
+ if(ToolUtil.isEmpty(vehicles)){
+ CarModel carModel = carModelMapper.selectById(car.getCarModelId());
+ boolean createVehicles = fleetEngineUtil.createVehicles(carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
+ if(!createVehicles){
+ for (int i = 0; i < 5; i++) {
+ createVehicles = fleetEngineUtil.createVehicles(carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
+ if(createVehicles){
+ break;
+ }
+ Thread.sleep(5000L);
+ }
+ }
+ boolean updateVehicles = fleetEngineUtil.updateVehicles("ONLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
+ if(!updateVehicles){
+ for (int i = 0; i < 5; i++) {
+ updateVehicles = fleetEngineUtil.updateVehicles("ONLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
+ if(updateVehicles){
+ break;
+ }
+ Thread.sleep(5000L);
+ }
+ }
+ }
+ }
+
+ //创建行程数据
+ String trip = fleetEngineUtil.getTrip(orderLogistics.getTripId());
+ int count = this.selectCount(new EntityWrapper<OrderLogistics>().eq("tripId", orderLogistics.getTripId()));
+ int count1 = orderPrivateCarService.selectCount(new EntityWrapper<OrderPrivateCar>().eq("tripId", orderLogistics.getTripId()));
+ if(ToolUtil.isNotEmpty(trip) || (count + count1) > 0){
+ String randomCode = UUIDUtil.getRandomCode();
+ redisUtil.setStrValue("trip" + orderLogistics.getUserId(), randomCode);
+ OrderLogistics orderLogistics1 = new OrderLogistics();
+ orderLogistics1.setId(orderLogistics.getId());
+ orderLogistics1.setTripId(randomCode);
+ this.updateById(orderLogistics1);
+ orderLogistics.setTripId(randomCode);
+ }
+ JSONObject createTrip = fleetEngineUtil.createTrip(vehicleId, 1, orderLogistics.getTripId(),
+ orderLogistics.getStartLat().toString(), orderLogistics.getStartLon().toString(), orderLogistics.getEndLat().toString(), orderLogistics.getEndLon().toString());
+ JSONObject error = createTrip.getJSONObject("error");
+ if(null != error){
+ for (int i = 0; i < 5; i++) {
+ createTrip = fleetEngineUtil.createTrip(vehicleId, 1, orderLogistics.getTripId(),
+ orderLogistics.getStartLat().toString(), orderLogistics.getStartLon().toString(), orderLogistics.getEndLat().toString(), orderLogistics.getEndLon().toString());
+ error = createTrip.getJSONObject("error");
+ String tripStatus = createTrip.getString("tripStatus");
+ if(null == error && "NEW".equals(tripStatus)){
+ break;
+ }
+ try {
+ Thread.sleep(3000L);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
if(orderSource == 2){//扫码下单
Driver driver = driverService.selectById(orderLogistics.getDriverId());
@@ -817,14 +871,21 @@
new Timer().schedule(new TimerTask() {
@Override
public void run() {
- Process process = null;
try {
- process = Runtime.getRuntime().exec("sudo rm -rf /home/igotechgh/nginx/html/files/audio/" + fileName);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- if (process != null) {
- process.destroy();
+ // 使用Runtime执行命令
+ Process process = Runtime.getRuntime().exec("sudo rm -rf /home/igotechgh/nginx/html/files/audio/" + fileName);
+ // 读取命令的输出
+ BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
+ String line;
+ while ((line = reader.readLine()) != null) {
+ System.out.println(line);
+ }
+ // 等待命令执行完成
+ process.waitFor();
+ // 关闭流
+ reader.close();
+ } catch (IOException | InterruptedException e) {
+ e.printStackTrace();
}
}
}, 30000);
@@ -934,14 +995,21 @@
new Timer().schedule(new TimerTask() {
@Override
public void run() {
- Process process = null;
try {
- process = Runtime.getRuntime().exec("sudo rm -rf /home/igotechgh/nginx/html/files/audio/" + fileName);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- if (process != null) {
- process.destroy();
+ // 使用Runtime执行命令
+ Process process = Runtime.getRuntime().exec("sudo rm -rf /home/igotechgh/nginx/html/files/audio/" + fileName);
+ // 读取命令的输出
+ BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
+ String line;
+ while ((line = reader.readLine()) != null) {
+ System.out.println(line);
+ }
+ // 等待命令执行完成
+ process.waitFor();
+ // 关闭流
+ reader.close();
+ } catch (IOException | InterruptedException e) {
+ e.printStackTrace();
}
}
}, 30000);
@@ -986,10 +1054,14 @@
* @throws Exception
*/
@Override
+ @Transactional
public ResultUtil payLogisticsOrder(Integer payType, Integer bankCardId, Integer orderId,Integer couponId, Integer redDeduction, Integer type, Integer language) throws Exception {
OrderLogistics orderLogistics = this.selectById(orderId);
- if(orderLogistics.getState() != 7){
+ if(orderLogistics.getState() == 8 || orderLogistics.getState() == 9){
return ResultUtil.error(language == 1 ? "订单已完成支付，不允许重复支付" : language == 2 ? "The order has been paid, recurring payments is not allowed." : "La commande a été payée, les paiements récurrents ne sont pas autorisés.", "");
+ }
+ if(orderLogistics.getState() != 7){
+ return ResultUtil.error(language == 1 ? "订单不在待支付状态，不允许支付" : language == 2 ? "The order is no longer with Pending Payment, making payments is not allowed." : "La commande n’est plus en attente de paiement, il n’est pas permis d’effectuer des paiements.", "");
}
Integer uid = orderLogistics.getUserId();
BigDecimal orderMoney = new BigDecimal(orderLogistics.getOrderMoney());
@@ -1019,7 +1091,6 @@
//计算优惠券
UserCouponRecord userCouponRecord = null;
if(null != couponId){
- //TODO 待翻译
if(null != redDeduction && 1 == redDeduction){
return ResultUtil.error(language == 1 ? "优惠券和红包不能同时使用" : language == 2 ? "Coupons and lucky-promo cannot be used at the same time." : "Les coupons et les bonus ne peuvent pas être utilisés en même temps", "");
}
@@ -1072,11 +1143,11 @@
userRedPacketRecord.setEndTime(new Date());
userRedPacketRecord.setState(2);
multiply1 = multiply1.subtract(remainingAmount).setScale(2, RoundingMode.HALF_EVEN);
- jsonObject.put("money", remainingAmount);
+ jsonObject.put("money", remainingAmount.setScale(2, RoundingMode.HALF_EVEN));
jsonArray.add(jsonObject);
}else if(remainingAmount.compareTo(multiply1) > 0){
userRedPacketRecord.setRemainingAmount(remainingAmount.subtract(multiply1).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
- jsonObject.put("money", multiply1);
+ jsonObject.put("money", multiply1.setScale(2, RoundingMode.HALF_EVEN));
jsonArray.add(jsonObject);
multiply1 = BigDecimal.ZERO;
}
@@ -1085,8 +1156,7 @@
userRedPacketRecordService.updateBatchById(userRedPacketRecords);
}
orderLogistics.setRedPacketId(jsonArray.toJSONString());
- }
- if(total > 0 && total.compareTo(multiply1.doubleValue()) < 0){
+ }else if(total > 0 && total.compareTo(multiply1.doubleValue()) < 0){
orderLogistics.setRedPacketMoney(total);
orderMoney = orderMoney.subtract(new BigDecimal(total)).setScale(2, RoundingMode.HALF_EVEN);
//获取红包id
@@ -1132,7 +1202,6 @@
}else{
resultUtil = ResultUtil.error(language == 1 ? "支付失败" : language == 2 ? "Payment failure" : "Paiement échoué", "");
}
- return resultUtil;
}
if(payType == 2) {//银行卡支付
@@ -1155,12 +1224,12 @@
resultUtil = TinggPayUtil.checkoutRequest(checkoutRequest);
if(resultUtil.getCode()==200){
+ this.updateById(orderLogistics);
paymentRecordService.saveData(1, null, null, orderId, 4, 2,
orderMoney.setScale(2, RoundingMode.HALF_EVEN).doubleValue(), null, 1);//添加预支付数据
}else{
resultUtil = ResultUtil.error(language == 1 ? "支付失败" : language == 2 ? "Payment failure" : "Paiement échoué", "");
}
- return resultUtil;
}
if(payType == 3){//余额支付
@@ -1195,45 +1264,43 @@
userCouponRecord.setEndTime(new Date());
userCouponRecordService.updateById(userCouponRecord);
}
- if(null != orderLogistics.getRedPacketId()){
- JSONArray jsonArray = JSON.parseArray(orderLogistics.getRedPacketId());
- for (int i = 0; i < jsonArray.size(); i++) {
- JSONObject jsonObject = jsonArray.getJSONObject(i);
- Integer id1 = jsonObject.getInteger("id");
- Double money = jsonObject.getDouble("money");
- UserRedPacketRecord userRedPacketRecord = userRedPacketRecordService.selectById(id1);
- userRedPacketRecord.setRemainingAmount(userRedPacketRecord.getRemainingAmount() - money);
- if(0 == userRedPacketRecord.getRemainingAmount()){
- userRedPacketRecord.setState(2);
- userRedPacketRecord.setEndTime(new Date());
- }
- userRedPacketRecordService.updateById(userRedPacketRecord);
- }
- }
+// if(null != orderLogistics.getRedPacketId()){
+// JSONArray jsonArray = JSON.parseArray(orderLogistics.getRedPacketId());
+// for (int i = 0; i < jsonArray.size(); i++) {
+// JSONObject jsonObject = jsonArray.getJSONObject(i);
+// Integer id1 = jsonObject.getInteger("id");
+// Double money = jsonObject.getDouble("money");
+// UserRedPacketRecord userRedPacketRecord = userRedPacketRecordService.selectById(id1);
+// userRedPacketRecord.setRemainingAmount(userRedPacketRecord.getRemainingAmount() - money);
+// if(0 == userRedPacketRecord.getRemainingAmount()){
+// userRedPacketRecord.setState(2);
+// userRedPacketRecord.setEndTime(new Date());
+// }
+// userRedPacketRecordService.updateById(userRedPacketRecord);
+// }
+// }
- if(orderLogistics.getIsplatPay()==1){
- //添加已收入明细
- Company company = companyService.selectById(orderLogistics.getCompanyId());
- Double speMoney = company.getSpeMoney();
- BigDecimal d = null;//企业收入
- BigDecimal c = null;//司机收入
- if(company.getIsSpeFixedOrProportional() == 2){//固定
- d = new BigDecimal(speMoney);
- c = new BigDecimal(orderLogistics.getOrderMoney()).subtract(d);//只有出行金额参与抽成，其余归属司机
- }
- if(company.getIsSpeFixedOrProportional() == 1){//比例
- Double price = orderLogistics.getStartMoney() + orderLogistics.getMileageMoney() + orderLogistics.getWaitMoney() + orderLogistics.getDurationMoney() + orderLogistics.getLongDistanceMoney();
- d = new BigDecimal(price).multiply(new BigDecimal(speMoney).divide(new BigDecimal(100), new MathContext(2, RoundingMode.HALF_EVEN)));
- c = new BigDecimal(orderLogistics.getOrderMoney()).subtract(d).setScale(2, BigDecimal.ROUND_HALF_EVEN);
- }
- incomeService.saveData(1, orderLogistics.getCompanyId(), 2, orderLogistics.getId(), 4, d.doubleValue());
- incomeService.saveData(2, orderLogistics.getDriverId(), 2, orderLogistics.getId(), 4, c.doubleValue());
- Driver driver = driverService.selectById(orderLogistics.getDriverId());
- driver.setBusinessMoney(new BigDecimal(null != driver.getBusinessMoney() ? driver.getBusinessMoney() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
- 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);
+ //添加已收入明细
+ Company company = companyService.selectById(orderLogistics.getCompanyId());
+ Double speMoney = company.getSpeMoney();
+ BigDecimal d = null;//企业收入
+ BigDecimal c = null;//司机收入
+ if(company.getIsSpeFixedOrProportional() == 2){//固定
+ d = new BigDecimal(speMoney);
+ c = new BigDecimal(orderLogistics.getOrderMoney()).subtract(d);//只有出行金额参与抽成，其余归属司机
}
+ if(company.getIsSpeFixedOrProportional() == 1){//比例
+ Double price = orderLogistics.getStartMoney() + orderLogistics.getMileageMoney() + orderLogistics.getWaitMoney() + orderLogistics.getDurationMoney() + orderLogistics.getLongDistanceMoney();
+ d = new BigDecimal(price).multiply(new BigDecimal(speMoney).divide(new BigDecimal(100), new MathContext(2, RoundingMode.HALF_EVEN)));
+ c = new BigDecimal(orderLogistics.getOrderMoney()).subtract(d).setScale(2, BigDecimal.ROUND_HALF_EVEN);
+ }
+ incomeService.saveData(1, orderLogistics.getCompanyId(), 2, orderLogistics.getId(), 4, d.doubleValue());
+ incomeService.saveData(2, orderLogistics.getDriverId(), 2, orderLogistics.getId(), 4, c.doubleValue());
+ Driver driver = driverService.selectById(orderLogistics.getDriverId());
+ driver.setBusinessMoney(new BigDecimal(null != driver.getBusinessMoney() ? driver.getBusinessMoney() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+ 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);
// TODO: 2020/5/24 这里需要给司机和用户推送订单状态
new Thread(new Runnable() {
@@ -1251,402 +1318,404 @@
language = userInfo.getLanguage();
- String payTypeChinese = "";
- String payTypeEnglish = "";
- String payTypeFrench = "";
- if(orderLogistics.getPayType() == 3){
- payTypeChinese = "余额支付";
- payTypeEnglish = "I-GO Wallet";
- payTypeFrench = "Portefeuille I-GO";
- }
- if(ToolUtil.isNotEmpty(userInfo.getEmail())){
- String path = templatePath + "user/receiptLogistics.html";
- Document document = Jsoup.parse(new File(path), "UTF-8");
- SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
- SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
- Driver driver = driverService.selectById(orderLogistics.getDriverId());
- Car car = carMapper.selectById(orderLogistics.getCarId());
- Double aDouble = 0D;
- if(null != orderLogistics.getDriverId()){
- aDouble = orderEvaluateService.queryDriverScore(orderLogistics.getDriverId());
- }
- if(1 == language){
- document.getElementById("english").remove();
- document.getElementById("french").remove();
- document.getElementsByTag("title").get(0).text("包裹收据");
- Element title_chinese = document.getElementById("title_chinese");
- title_chinese.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，您在I-GO此订单消费GHS " + orderLogistics.getPayMoney());
- Element qbj_chinese = document.getElementById("qbj_chinese");
- qbj_chinese.text("GHS " + new BigDecimal(orderLogistics.getStartMoney()).setScale(2, RoundingMode.HALF_EVEN));
- Element scf_chinese = document.getElementById("scf_chinese");
- if(null != orderLogistics.getDurationMoney() && orderLogistics.getDurationMoney() > 0){
- scf_chinese.text("GHS " + new BigDecimal(orderLogistics.getDurationMoney()).setScale(2, RoundingMode.HALF_EVEN));
- }else{
- Element scf_chinese_div = document.getElementById("scf_chinese_div");
- scf_chinese_div.remove();
- }
- Element lcf_chinese = document.getElementById("lcf_chinese");
- if(null != orderLogistics.getMileageMoney() && orderLogistics.getMileageMoney() > 0){
- lcf_chinese.text("GHS " + new BigDecimal(orderLogistics.getMileageMoney()).setScale(2, RoundingMode.HALF_EVEN));
- }else{
- Element lcf_chinese_div = document.getElementById("lcf_chinese_div");
- lcf_chinese_div.remove();
- }
- Element ddf_chinese = document.getElementById("ddf_chinese");
- if(null != orderLogistics.getWaitMoney() && orderLogistics.getWaitMoney() > 0){
- ddf_chinese.text("GHS " + new BigDecimal(orderLogistics.getWaitMoney()).setScale(2, RoundingMode.HALF_EVEN));
- }else{
- Element ddf_chinese_div = document.getElementById("ddf_chinese_div");
- ddf_chinese_div.remove();
- }
- Element glf_chinese = document.getElementById("glf_chinese");
- if(null != orderLogistics.getRoadTollMoney() && orderLogistics.getRoadTollMoney() > 0){
- glf_chinese.text("GHS " + new BigDecimal(orderLogistics.getRoadTollMoney()).setScale(2, RoundingMode.HALF_EVEN));
- }else{
- Element glf_chinese_div = document.getElementById("glf_chinese_div");
- glf_chinese_div.remove();
- }
- Element tcf_chinese = document.getElementById("tcf_chinese");
- if(null != orderLogistics.getParkMoney() && orderLogistics.getParkMoney() > 0){
- tcf_chinese.text("GHS " + new BigDecimal(orderLogistics.getParkMoney()).setScale(2, RoundingMode.HALF_EVEN));
- }else{
- Element tcf_chinese_div = document.getElementById("tcf_chinese_div");
- tcf_chinese_div.remove();
- }
- Element bcj_chinese = document.getElementById("bcj_chinese");
- if(null != orderLogistics.getPriceDifference() && orderLogistics.getPriceDifference() > 0){
- bcj_chinese.text("GHS " + new BigDecimal(orderLogistics.getPriceDifference()).setScale(2, RoundingMode.HALF_EVEN));
- }else{
- Element bcj_chinese_div = document.getElementById("bcj_chinese_div");
- bcj_chinese_div.remove();
- }
- if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
- Element yhq_chinese = document.getElementById("yhq_chinese");
- yhq_chinese.text("GHS -" + new BigDecimal(orderLogistics.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
- }else{
- Element yhq_chinese_div = document.getElementById("yhq_chinese_div");
- yhq_chinese_div.remove();
- }
- if(null != orderLogistics.getDiscountMoney() && orderLogistics.getDiscountMoney() > 0){
- Element zk_chinese = document.getElementById("zk_chinese");
- zk_chinese.text("GHS -" + new BigDecimal(orderLogistics.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
- }else{
- Element zk_chinese_div = document.getElementById("zk_chinese_div");
- zk_chinese_div.remove();
- }
- if(null != orderLogistics.getRedPacketMoney() && orderLogistics.getRedPacketMoney() > 0){
- Element hb_chinese = document.getElementById("hb_chinese");
- hb_chinese.text("GHS -" + new BigDecimal(orderLogistics.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
- }else{
- Element hb_chinese_div = document.getElementById("hb_chinese_div");
- hb_chinese_div.remove();
- }
- Element xj_chinese = document.getElementById("xj_chinese");
- xj_chinese.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
- Element pay_type_chinese = document.getElementById("pay_type_chinese");
- pay_type_chinese.text(payTypeChinese);
- Element pay_money_chinese = document.getElementById("pay_money_chinese");
- pay_money_chinese.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
- Element dispute_chinese = document.getElementById("dispute_chinese");
- if(null != orderLogistics.getIsDispute() && orderLogistics.getIsDispute() == 1){
- dispute_chinese.text("（注意: 争议订单，经过三方协商，平台最终定价为 GHS" + new BigDecimal(orderLogistics.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN) + "）");
- }else{
- dispute_chinese.remove();
- }
- Element pdf_chinese = document.getElementById("pdf_chinese");
- pdf_chinese.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
- 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=4");
+ Integer finalLanguage1 = language;
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ if(ToolUtil.isNotEmpty(userInfo.getEmail())){
+ String path = templatePath + "user/receiptLogistics.html";
+ Document document = Jsoup.parse(new File(path), "UTF-8");
+ SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
+ SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ Driver driver = driverService.selectById(orderLogistics.getDriverId());
+ Car car = carMapper.selectById(orderLogistics.getCarId());
+ Double aDouble = 0D;
+ if(null != orderLogistics.getDriverId()){
+ aDouble = orderEvaluateService.queryDriverScore(orderLogistics.getDriverId());
+ }
+ if(1 == finalLanguage1){
+ document.getElementById("english").remove();
+ document.getElementById("french").remove();
+ document.getElementsByTag("title").get(0).text("包裹收据");
+ Element title_chinese = document.getElementById("title_chinese");
+ title_chinese.text(DateUtil.conversionFormat(finalLanguage1, sdf2.format(orderLogistics.getTravelTime())) + "，您在I-GO此订单消费GHS " + orderLogistics.getPayMoney());
+ Element qbj_chinese = document.getElementById("qbj_chinese");
+ qbj_chinese.text("GHS " + new BigDecimal(orderLogistics.getStartMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element scf_chinese = document.getElementById("scf_chinese");
+ if(null != orderLogistics.getDurationMoney() && orderLogistics.getDurationMoney() > 0){
+ scf_chinese.text("GHS " + new BigDecimal(orderLogistics.getDurationMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element scf_chinese_div = document.getElementById("scf_chinese_div");
+ scf_chinese_div.remove();
+ }
+ Element lcf_chinese = document.getElementById("lcf_chinese");
+ if(null != orderLogistics.getMileageMoney() && orderLogistics.getMileageMoney() > 0){
+ lcf_chinese.text("GHS " + new BigDecimal(orderLogistics.getMileageMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element lcf_chinese_div = document.getElementById("lcf_chinese_div");
+ lcf_chinese_div.remove();
+ }
+ Element ddf_chinese = document.getElementById("ddf_chinese");
+ if(null != orderLogistics.getWaitMoney() && orderLogistics.getWaitMoney() > 0){
+ ddf_chinese.text("GHS " + new BigDecimal(orderLogistics.getWaitMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element ddf_chinese_div = document.getElementById("ddf_chinese_div");
+ ddf_chinese_div.remove();
+ }
+ Element glf_chinese = document.getElementById("glf_chinese");
+ if(null != orderLogistics.getRoadTollMoney() && orderLogistics.getRoadTollMoney() > 0){
+ glf_chinese.text("GHS " + new BigDecimal(orderLogistics.getRoadTollMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element glf_chinese_div = document.getElementById("glf_chinese_div");
+ glf_chinese_div.remove();
+ }
+ Element tcf_chinese = document.getElementById("tcf_chinese");
+ if(null != orderLogistics.getParkMoney() && orderLogistics.getParkMoney() > 0){
+ tcf_chinese.text("GHS " + new BigDecimal(orderLogistics.getParkMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element tcf_chinese_div = document.getElementById("tcf_chinese_div");
+ tcf_chinese_div.remove();
+ }
+ Element bcj_chinese = document.getElementById("bcj_chinese");
+ if(null != orderLogistics.getPriceDifference() && orderLogistics.getPriceDifference() > 0){
+ bcj_chinese.text("GHS " + new BigDecimal(orderLogistics.getPriceDifference()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element bcj_chinese_div = document.getElementById("bcj_chinese_div");
+ bcj_chinese_div.remove();
+ }
+ if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
+ Element yhq_chinese = document.getElementById("yhq_chinese");
+ yhq_chinese.text("GHS -" + new BigDecimal(orderLogistics.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element yhq_chinese_div = document.getElementById("yhq_chinese_div");
+ yhq_chinese_div.remove();
+ }
+ if(null != orderLogistics.getDiscountMoney() && orderLogistics.getDiscountMoney() > 0){
+ Element zk_chinese = document.getElementById("zk_chinese");
+ zk_chinese.text("GHS -" + new BigDecimal(orderLogistics.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element zk_chinese_div = document.getElementById("zk_chinese_div");
+ zk_chinese_div.remove();
+ }
+ if(null != orderLogistics.getRedPacketMoney() && orderLogistics.getRedPacketMoney() > 0){
+ Element hb_chinese = document.getElementById("hb_chinese");
+ hb_chinese.text("GHS -" + new BigDecimal(orderLogistics.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element hb_chinese_div = document.getElementById("hb_chinese_div");
+ hb_chinese_div.remove();
+ }
+ Element xj_chinese = document.getElementById("xj_chinese");
+ xj_chinese.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element pay_type_chinese = document.getElementById("pay_type_chinese");
+ pay_type_chinese.text("余额支付");
+ Element pay_money_chinese = document.getElementById("pay_money_chinese");
+ pay_money_chinese.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element dispute_chinese = document.getElementById("dispute_chinese");
+ if(null != orderLogistics.getIsDispute() && orderLogistics.getIsDispute() == 1){
+ dispute_chinese.text("（注意: 争议订单，经过三方协商，平台最终定价为 GHS" + new BigDecimal(orderLogistics.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN) + "）");
+ }else{
+ dispute_chinese.remove();
+ }
+ Element pdf_chinese = document.getElementById("pdf_chinese");
+ pdf_chinese.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
+ Element lost_item_chinese = document.getElementById("lost_item_chinese");
+ lost_item_chinese.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + finalLanguage1 + "&orderId=" + orderId + "&orderType=4");
// Element track_chinese = document.getElementById("track_chinese");
// track_chinese.attr("href", "https://igo.i-go.group/mailbox/user/location.html");
- Element pay_time_chinese = document.getElementById("pay_time_chinese");
- pay_time_chinese.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime())));
- Elements driver_chinese = document.getElementsByClass("driver_chinese");
- for (int i = 0; i < driver_chinese.size(); i++) {
- Element element = driver_chinese.get(i);
- element.text(" " + driver.getFirstName() + "." + driver.getLastName());
- }
- Element cp_chinese = document.getElementById("cp_chinese");
- cp_chinese.text("车牌：" + car.getCarLicensePlate());
- Element pf_chinese = document.getElementById("pf_chinese");
- pf_chinese.text("司机评分：" + aDouble);
- Element start_address_chinese = document.getElementById("start_address_chinese");
- start_address_chinese.text(orderLogistics.getStartAddress());
- Element end_address_chinese = document.getElementById("end_address_chinese");
- end_address_chinese.text(orderLogistics.getEndAddress());
- Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
- Element server_tel_chinese = document.getElementById("server_tel_chinese");
- server_tel_chinese.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
- }
- if(2 == language){
- document.getElementById("chinese").remove();
- document.getElementById("french").remove();
- document.getElementsByTag("title").get(0).text("Delivery receipt");
- Element title_english = document.getElementById("title_english");
- title_english.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，You spent GHS " + orderLogistics.getPayMoney() + " on the trip ");
- Element qbj_english = document.getElementById("qbj_english");
- qbj_english.text("GHS " + new BigDecimal(orderLogistics.getStartMoney()).setScale(2, RoundingMode.HALF_EVEN));
- Element scf_english = document.getElementById("scf_english");
- if(null != orderLogistics.getDurationMoney() && orderLogistics.getDurationMoney() > 0){
- scf_english.text("GHS " + new BigDecimal(orderLogistics.getDurationMoney()).setScale(2, RoundingMode.HALF_EVEN));
- }else{
- Element scf_english_div = document.getElementById("scf_english_div");
- scf_english_div.remove();
- }
- Element lcf_english = document.getElementById("lcf_english");
- if(null != orderLogistics.getMileageMoney() && orderLogistics.getMileageMoney() > 0){
- lcf_english.text("GHS " + new BigDecimal(orderLogistics.getMileageMoney()).setScale(2, RoundingMode.HALF_EVEN));
- }else{
- Element lcf_english_div = document.getElementById("lcf_english_div");
- lcf_english_div.remove();
- }
- Element ddf_english = document.getElementById("ddf_english");
- if(null != orderLogistics.getWaitMoney() && orderLogistics.getWaitMoney() > 0){
- ddf_english.text("GHS " + new BigDecimal(orderLogistics.getWaitMoney()).setScale(2, RoundingMode.HALF_EVEN));
- }else{
- Element ddf_english_div = document.getElementById("ddf_english_div");
- ddf_english_div.remove();
- }
- Element glf_english = document.getElementById("glf_english");
- if(null != orderLogistics.getRoadTollMoney() && orderLogistics.getRoadTollMoney() > 0){
- glf_english.text("GHS " + new BigDecimal(orderLogistics.getRoadTollMoney()).setScale(2, RoundingMode.HALF_EVEN));
- }else{
- Element glf_english_div = document.getElementById("glf_english_div");
- glf_english_div.remove();
- }
- Element tcf_english = document.getElementById("tcf_english");
- if(null != orderLogistics.getParkMoney() && orderLogistics.getParkMoney() > 0){
- tcf_english.text("GHS " + new BigDecimal(orderLogistics.getParkMoney()).setScale(2, RoundingMode.HALF_EVEN));
- }else{
- Element tcf_english_div = document.getElementById("tcf_english_div");
- tcf_english_div.remove();
- }
- Element bcj_english = document.getElementById("bcj_english");
- if(null != orderLogistics.getPriceDifference() && orderLogistics.getPriceDifference() > 0){
- bcj_english.text("GHS " + new BigDecimal(orderLogistics.getPriceDifference()).setScale(2, RoundingMode.HALF_EVEN));
- }else{
- Element bcj_english_div = document.getElementById("bcj_english_div");
- bcj_english_div.remove();
- }
- if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
- Element yhq_english = document.getElementById("yhq_english");
- yhq_english.text("GHS -" + new BigDecimal(orderLogistics.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
- }else{
- Element yhq_english_div = document.getElementById("yhq_english_div");
- yhq_english_div.remove();
- }
- if(null != orderLogistics.getDiscountMoney() && orderLogistics.getDiscountMoney() > 0){
- Element zk_english = document.getElementById("zk_english");
- zk_english.text("GHS -" + new BigDecimal(orderLogistics.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
- }else{
- Element zk_english_div = document.getElementById("zk_english_div");
- zk_english_div.remove();
- }
- if(null != orderLogistics.getRedPacketMoney() && orderLogistics.getRedPacketMoney() > 0){
- Element hb_english = document.getElementById("hb_english");
- hb_english.text("GHS -" + new BigDecimal(orderLogistics.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
- }else{
- Element hb_english_div = document.getElementById("hb_english_div");
- hb_english_div.remove();
- }
- Element xj_english = document.getElementById("xj_english");
- xj_english.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
- Element pay_type_english = document.getElementById("pay_type_english");
- pay_type_english.text(payTypeEnglish);
- Element pay_money_english = document.getElementById("pay_money_english");
- pay_money_english.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
- Element dispute_english = document.getElementById("dispute_english");
- if(null != orderLogistics.getIsDispute() && orderLogistics.getIsDispute() == 1){
- dispute_english.text("（Note: Disputed order, after tripartite negotiation, the final pricing of the platform is GHS " + new BigDecimal(orderLogistics.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN) + "）");
- }else{
- dispute_english.remove();
- }
- Element pdf_english = document.getElementById("pdf_english");
- pdf_english.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
- 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=4");
+ Element pay_time_chinese = document.getElementById("pay_time_chinese");
+ pay_time_chinese.text(DateUtil.conversionFormat(finalLanguage1, sdf1.format(orderLogistics.getTravelTime())));
+ Elements driver_chinese = document.getElementsByClass("driver_chinese");
+ for (int i = 0; i < driver_chinese.size(); i++) {
+ Element element = driver_chinese.get(i);
+ element.text(" " + driver.getFirstName() + "." + driver.getLastName());
+ }
+ Element cp_chinese = document.getElementById("cp_chinese");
+ cp_chinese.text("车牌：" + car.getCarLicensePlate());
+ Element pf_chinese = document.getElementById("pf_chinese");
+ pf_chinese.text("司机评分：" + aDouble);
+ Element start_address_chinese = document.getElementById("start_address_chinese");
+ start_address_chinese.text(orderLogistics.getStartAddress());
+ Element end_address_chinese = document.getElementById("end_address_chinese");
+ end_address_chinese.text(orderLogistics.getEndAddress());
+ Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
+ Element server_tel_chinese = document.getElementById("server_tel_chinese");
+ server_tel_chinese.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
+ }
+ if(2 == finalLanguage1){
+ document.getElementById("chinese").remove();
+ document.getElementById("french").remove();
+ document.getElementsByTag("title").get(0).text("Delivery receipt");
+ Element title_english = document.getElementById("title_english");
+ title_english.text(DateUtil.conversionFormat(finalLanguage1, sdf2.format(orderLogistics.getTravelTime())) + "，You spent GHS " + orderLogistics.getPayMoney() + " on the trip ");
+ Element qbj_english = document.getElementById("qbj_english");
+ qbj_english.text("GHS " + new BigDecimal(orderLogistics.getStartMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element scf_english = document.getElementById("scf_english");
+ if(null != orderLogistics.getDurationMoney() && orderLogistics.getDurationMoney() > 0){
+ scf_english.text("GHS " + new BigDecimal(orderLogistics.getDurationMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element scf_english_div = document.getElementById("scf_english_div");
+ scf_english_div.remove();
+ }
+ Element lcf_english = document.getElementById("lcf_english");
+ if(null != orderLogistics.getMileageMoney() && orderLogistics.getMileageMoney() > 0){
+ lcf_english.text("GHS " + new BigDecimal(orderLogistics.getMileageMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element lcf_english_div = document.getElementById("lcf_english_div");
+ lcf_english_div.remove();
+ }
+ Element ddf_english = document.getElementById("ddf_english");
+ if(null != orderLogistics.getWaitMoney() && orderLogistics.getWaitMoney() > 0){
+ ddf_english.text("GHS " + new BigDecimal(orderLogistics.getWaitMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element ddf_english_div = document.getElementById("ddf_english_div");
+ ddf_english_div.remove();
+ }
+ Element glf_english = document.getElementById("glf_english");
+ if(null != orderLogistics.getRoadTollMoney() && orderLogistics.getRoadTollMoney() > 0){
+ glf_english.text("GHS " + new BigDecimal(orderLogistics.getRoadTollMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element glf_english_div = document.getElementById("glf_english_div");
+ glf_english_div.remove();
+ }
+ Element tcf_english = document.getElementById("tcf_english");
+ if(null != orderLogistics.getParkMoney() && orderLogistics.getParkMoney() > 0){
+ tcf_english.text("GHS " + new BigDecimal(orderLogistics.getParkMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element tcf_english_div = document.getElementById("tcf_english_div");
+ tcf_english_div.remove();
+ }
+ Element bcj_english = document.getElementById("bcj_english");
+ if(null != orderLogistics.getPriceDifference() && orderLogistics.getPriceDifference() > 0){
+ bcj_english.text("GHS " + new BigDecimal(orderLogistics.getPriceDifference()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element bcj_english_div = document.getElementById("bcj_english_div");
+ bcj_english_div.remove();
+ }
+ if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
+ Element yhq_english = document.getElementById("yhq_english");
+ yhq_english.text("GHS -" + new BigDecimal(orderLogistics.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element yhq_english_div = document.getElementById("yhq_english_div");
+ yhq_english_div.remove();
+ }
+ if(null != orderLogistics.getDiscountMoney() && orderLogistics.getDiscountMoney() > 0){
+ Element zk_english = document.getElementById("zk_english");
+ zk_english.text("GHS -" + new BigDecimal(orderLogistics.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element zk_english_div = document.getElementById("zk_english_div");
+ zk_english_div.remove();
+ }
+ if(null != orderLogistics.getRedPacketMoney() && orderLogistics.getRedPacketMoney() > 0){
+ Element hb_english = document.getElementById("hb_english");
+ hb_english.text("GHS -" + new BigDecimal(orderLogistics.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element hb_english_div = document.getElementById("hb_english_div");
+ hb_english_div.remove();
+ }
+ Element xj_english = document.getElementById("xj_english");
+ xj_english.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element pay_type_english = document.getElementById("pay_type_english");
+ pay_type_english.text("I-GO Wallet");
+ Element pay_money_english = document.getElementById("pay_money_english");
+ pay_money_english.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element dispute_english = document.getElementById("dispute_english");
+ if(null != orderLogistics.getIsDispute() && orderLogistics.getIsDispute() == 1){
+ dispute_english.text("（Note: Disputed order, after tripartite negotiation, the final pricing of the platform is GHS " + new BigDecimal(orderLogistics.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN) + "）");
+ }else{
+ dispute_english.remove();
+ }
+ Element pdf_english = document.getElementById("pdf_english");
+ pdf_english.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
+ Element lost_item_english = document.getElementById("lost_item_english");
+ lost_item_english.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + finalLanguage1 + "&orderId=" + orderId + "&orderType=4");
// Element track_english = document.getElementById("track_english");
// track_english.attr("href", "https://igo.i-go.group/mailbox/user/location.html");
- Element pay_time_english = document.getElementById("pay_time_english");
- pay_time_english.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime())));
- Elements driver_english = document.getElementsByClass("driver_english");
- for (int i = 0; i < driver_english.size(); i++) {
- Element element = driver_english.get(i);
- element.text(" " + driver.getFirstName() + "." + driver.getLastName());
- }
- Element cp_english = document.getElementById("cp_english");
- cp_english.text("Number Plate：" + car.getCarLicensePlate());
- Element pf_english = document.getElementById("pf_english");
- pf_english.text("Driver Rating：" + aDouble);
- Element start_address_english = document.getElementById("start_address_english");
- start_address_english.text(orderLogistics.getStartAddress());
- Element end_address_english = document.getElementById("end_address_english");
- end_address_english.text(orderLogistics.getEndAddress());
- Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
- Element server_tel_english = document.getElementById("server_tel_english");
- server_tel_english.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
- }
- if(3 == language){
- document.getElementById("chinese").remove();
- document.getElementById("english").remove();
- document.getElementsByTag("title").get(0).text("Reçu de livraison");
- Element title_french = document.getElementById("title_french");
- title_french.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，Vous consommez GHS " + orderLogistics.getPayMoney() + " sur votre commande I-GO ");
- Element qbj_french = document.getElementById("qbj_french");
- qbj_french.text("GHS " + new BigDecimal(orderLogistics.getStartMoney()).setScale(2, RoundingMode.HALF_EVEN));
- Element scf_french = document.getElementById("scf_french");
- if(null != orderLogistics.getDurationMoney() && orderLogistics.getDurationMoney() > 0){
- scf_french.text("GHS " + new BigDecimal(orderLogistics.getDurationMoney()).setScale(2, RoundingMode.HALF_EVEN));
- }else{
- Element scf_french_div = document.getElementById("scf_french_div");
- scf_french_div.remove();
- }
- Element lcf_french = document.getElementById("lcf_french");
- if(null != orderLogistics.getMileageMoney() && orderLogistics.getMileageMoney() > 0){
- lcf_french.text("GHS " + new BigDecimal(orderLogistics.getMileageMoney()).setScale(2, RoundingMode.HALF_EVEN));
- }else{
- Element lcf_french_div = document.getElementById("lcf_french_div");
- lcf_french_div.remove();
- }
- Element ddf_french = document.getElementById("ddf_french");
- if(null != orderLogistics.getWaitMoney() && orderLogistics.getWaitMoney() > 0){
- ddf_french.text("GHS " + new BigDecimal(orderLogistics.getWaitMoney()).setScale(2, RoundingMode.HALF_EVEN));
- }else{
- Element ddf_french_div = document.getElementById("ddf_french_div");
- ddf_french_div.remove();
- }
- Element glf_french = document.getElementById("glf_french");
- if(null != orderLogistics.getRoadTollMoney() && orderLogistics.getRoadTollMoney() > 0){
- glf_french.text("GHS " + new BigDecimal(orderLogistics.getRoadTollMoney()).setScale(2, RoundingMode.HALF_EVEN));
- }else{
- Element glf_french_div = document.getElementById("glf_french_div");
- glf_french_div.remove();
- }
- Element tcf_french = document.getElementById("tcf_french");
- if(null != orderLogistics.getParkMoney() && orderLogistics.getParkMoney() > 0){
- tcf_french.text("GHS " + new BigDecimal(orderLogistics.getParkMoney()).setScale(2, RoundingMode.HALF_EVEN));
- }else{
- Element tcf_french_div = document.getElementById("tcf_french_div");
- tcf_french_div.remove();
- }
- Element bcj_french = document.getElementById("bcj_french");
- if(null != orderLogistics.getPriceDifference() && orderLogistics.getPriceDifference() > 0){
- bcj_french.text("GHS " + new BigDecimal(orderLogistics.getPriceDifference()).setScale(2, RoundingMode.HALF_EVEN));
- }else{
- Element bcj_french_div = document.getElementById("bcj_french_div");
- bcj_french_div.remove();
- }
- if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
- Element yhq_french = document.getElementById("yhq_french");
- yhq_french.text("GHS -" + new BigDecimal(orderLogistics.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
- }else{
- Element yhq_french_div = document.getElementById("yhq_french_div");
- yhq_french_div.remove();
- }
- if(null != orderLogistics.getDiscountMoney() && orderLogistics.getDiscountMoney() > 0){
- Element zk_french = document.getElementById("zk_french");
- zk_french.text("GHS -" + new BigDecimal(orderLogistics.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
- }else{
- Element zk_french_div = document.getElementById("zk_french_div");
- zk_french_div.remove();
- }
- if(null != orderLogistics.getRedPacketMoney() && orderLogistics.getRedPacketMoney() > 0){
- Element hb_french = document.getElementById("hb_french");
- hb_french.text("GHS -" + new BigDecimal(orderLogistics.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
- }else{
- Element hb_french_div = document.getElementById("hb_french_div");
- hb_french_div.remove();
- }
- Element xj_french = document.getElementById("xj_french");
- xj_french.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
- Element pay_type_french = document.getElementById("pay_type_french");
- pay_type_french.text(payTypeFrench);
- Element pay_money_french = document.getElementById("pay_money_french");
- pay_money_french.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
- Element dispute_french = document.getElementById("dispute_french");
- if(null != orderLogistics.getIsDispute() && orderLogistics.getIsDispute() == 1){
- dispute_french.text("（Remarque: Il s’agit d’une commande contestée, et après des négociations entre trois parties, la plateforme l’a finalement tarifée à GHS " + new BigDecimal(orderLogistics.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN) + "）");
- }else{
- dispute_french.remove();
- }
- Element pdf_french = document.getElementById("pdf_french");
- pdf_french.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
- 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=4");
+ Element pay_time_english = document.getElementById("pay_time_english");
+ pay_time_english.text(DateUtil.conversionFormat(finalLanguage1, sdf1.format(orderLogistics.getTravelTime())));
+ Elements driver_english = document.getElementsByClass("driver_english");
+ for (int i = 0; i < driver_english.size(); i++) {
+ Element element = driver_english.get(i);
+ element.text(" " + driver.getFirstName() + "." + driver.getLastName());
+ }
+ Element cp_english = document.getElementById("cp_english");
+ cp_english.text("Number Plate：" + car.getCarLicensePlate());
+ Element pf_english = document.getElementById("pf_english");
+ pf_english.text("Driver Rating：" + aDouble);
+ Element start_address_english = document.getElementById("start_address_english");
+ start_address_english.text(orderLogistics.getStartAddress());
+ Element end_address_english = document.getElementById("end_address_english");
+ end_address_english.text(orderLogistics.getEndAddress());
+ Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
+ Element server_tel_english = document.getElementById("server_tel_english");
+ server_tel_english.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
+ }
+ if(3 == finalLanguage1){
+ document.getElementById("chinese").remove();
+ document.getElementById("english").remove();
+ document.getElementsByTag("title").get(0).text("Reçu de livraison");
+ Element title_french = document.getElementById("title_french");
+ title_french.text(DateUtil.conversionFormat(finalLanguage1, sdf2.format(orderLogistics.getTravelTime())) + "，Vous consommez GHS " + orderLogistics.getPayMoney() + " sur votre commande I-GO ");
+ Element qbj_french = document.getElementById("qbj_french");
+ qbj_french.text("GHS " + new BigDecimal(orderLogistics.getStartMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element scf_french = document.getElementById("scf_french");
+ if(null != orderLogistics.getDurationMoney() && orderLogistics.getDurationMoney() > 0){
+ scf_french.text("GHS " + new BigDecimal(orderLogistics.getDurationMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element scf_french_div = document.getElementById("scf_french_div");
+ scf_french_div.remove();
+ }
+ Element lcf_french = document.getElementById("lcf_french");
+ if(null != orderLogistics.getMileageMoney() && orderLogistics.getMileageMoney() > 0){
+ lcf_french.text("GHS " + new BigDecimal(orderLogistics.getMileageMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element lcf_french_div = document.getElementById("lcf_french_div");
+ lcf_french_div.remove();
+ }
+ Element ddf_french = document.getElementById("ddf_french");
+ if(null != orderLogistics.getWaitMoney() && orderLogistics.getWaitMoney() > 0){
+ ddf_french.text("GHS " + new BigDecimal(orderLogistics.getWaitMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element ddf_french_div = document.getElementById("ddf_french_div");
+ ddf_french_div.remove();
+ }
+ Element glf_french = document.getElementById("glf_french");
+ if(null != orderLogistics.getRoadTollMoney() && orderLogistics.getRoadTollMoney() > 0){
+ glf_french.text("GHS " + new BigDecimal(orderLogistics.getRoadTollMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element glf_french_div = document.getElementById("glf_french_div");
+ glf_french_div.remove();
+ }
+ Element tcf_french = document.getElementById("tcf_french");
+ if(null != orderLogistics.getParkMoney() && orderLogistics.getParkMoney() > 0){
+ tcf_french.text("GHS " + new BigDecimal(orderLogistics.getParkMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element tcf_french_div = document.getElementById("tcf_french_div");
+ tcf_french_div.remove();
+ }
+ Element bcj_french = document.getElementById("bcj_french");
+ if(null != orderLogistics.getPriceDifference() && orderLogistics.getPriceDifference() > 0){
+ bcj_french.text("GHS " + new BigDecimal(orderLogistics.getPriceDifference()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element bcj_french_div = document.getElementById("bcj_french_div");
+ bcj_french_div.remove();
+ }
+ if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
+ Element yhq_french = document.getElementById("yhq_french");
+ yhq_french.text("GHS -" + new BigDecimal(orderLogistics.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element yhq_french_div = document.getElementById("yhq_french_div");
+ yhq_french_div.remove();
+ }
+ if(null != orderLogistics.getDiscountMoney() && orderLogistics.getDiscountMoney() > 0){
+ Element zk_french = document.getElementById("zk_french");
+ zk_french.text("GHS -" + new BigDecimal(orderLogistics.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element zk_french_div = document.getElementById("zk_french_div");
+ zk_french_div.remove();
+ }
+ if(null != orderLogistics.getRedPacketMoney() && orderLogistics.getRedPacketMoney() > 0){
+ Element hb_french = document.getElementById("hb_french");
+ hb_french.text("GHS -" + new BigDecimal(orderLogistics.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element hb_french_div = document.getElementById("hb_french_div");
+ hb_french_div.remove();
+ }
+ Element xj_french = document.getElementById("xj_french");
+ xj_french.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element pay_type_french = document.getElementById("pay_type_french");
+ pay_type_french.text("Portefeuille I-GO");
+ Element pay_money_french = document.getElementById("pay_money_french");
+ pay_money_french.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element dispute_french = document.getElementById("dispute_french");
+ if(null != orderLogistics.getIsDispute() && orderLogistics.getIsDispute() == 1){
+ dispute_french.text("（Remarque: Il s’agit d’une commande contestée, et après des négociations entre trois parties, la plateforme l’a finalement tarifée à GHS " + new BigDecimal(orderLogistics.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN) + "）");
+ }else{
+ dispute_french.remove();
+ }
+ Element pdf_french = document.getElementById("pdf_french");
+ pdf_french.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
+ Element lost_item_french = document.getElementById("lost_item_french");
+ lost_item_french.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + finalLanguage1 + "&orderId=" + orderId + "&orderType=4");
// Element track_french = document.getElementById("track_french");
// track_french.attr("href", "https://igo.i-go.group/mailbox/user/location.html");
- Element pay_time_french = document.getElementById("pay_time_french");
- pay_time_french.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime())));
- Elements driver_french = document.getElementsByClass("driver_french");
- for (int i = 0; i < driver_french.size(); i++) {
- Element element = driver_french.get(i);
- element.text(" " + driver.getFirstName() + "." + driver.getLastName());
+ Element pay_time_french = document.getElementById("pay_time_french");
+ pay_time_french.text(DateUtil.conversionFormat(finalLanguage1, sdf1.format(orderLogistics.getTravelTime())));
+ Elements driver_french = document.getElementsByClass("driver_french");
+ for (int i = 0; i < driver_french.size(); i++) {
+ Element element = driver_french.get(i);
+ element.text(" " + driver.getFirstName() + "." + driver.getLastName());
+ }
+ Element cp_french = document.getElementById("cp_french");
+ cp_french.text("Plaque: GS " + car.getCarLicensePlate());
+ Element pf_french = document.getElementById("pf_french");
+ pf_french.text("Note du chauffeur: " + aDouble);
+ Element start_address_french = document.getElementById("start_address_french");
+ start_address_french.text(orderLogistics.getStartAddress());
+ Element end_address_french = document.getElementById("end_address_french");
+ end_address_french.text(orderLogistics.getEndAddress());
+ Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
+ Element server_tel_french = document.getElementById("server_tel_french");
+ server_tel_french.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
+ }
+
+ EmailUtil.send(userInfo.getEmail(), finalLanguage1 == 1 ? "包裹收据" : finalLanguage1 == 2 ? "Delivery receipt" : "Reçu de livraison", document.html());
+
+ //开始生成pdf收据和html收据
+ File file = new File("/home/igotechgh/nginx/html/files/html/");
+ if(!file.exists()){
+ file.mkdirs();
+ }
+ file = new File("/home/igotechgh/nginx/html/files/html/parcel_receipt_" + orderId + ".html");
+ if(!file.exists()){
+ file.createNewFile();
+ }
+ FileWriter fileWriter = new FileWriter(file);
+ fileWriter.write(document.html());
+ fileWriter.flush();
+ fileWriter.close();
+
+ File file1 = new File("/home/igotechgh/nginx/html/files/pdf/");
+ if(!file1.exists()){
+ file1.mkdirs();
+ }
+ file1 = new File("/home/igotechgh/nginx/html/files/pdf/parcel_receipt_" + orderId + ".pdf");
+ if(!file1.exists()){
+ file1.createNewFile();
+ }
+ try{
+ FileOutputStream fileOutputStream = new FileOutputStream(file1);
+ HtmlToPdfUtils.convertToPdf("/home/igotechgh/nginx/html/files/html/parcel_receipt_" + orderId + ".html", "I-GO", fileOutputStream);
+ }catch (Exception e){
+ e.printStackTrace();
+ System.out.println("html转pdf异常");
+ }
+
+ String link ="https://igo.i-go.group/files/html/parcel_receipt_" + orderId + ".html";
+ TEmail tEmail = new TEmail();
+ tEmail.setLink(link);
+ tEmail.setUserId(userInfo.getId());
+ tEmail.setType(1);
+ tEmail.setName(finalLanguage1 == 1 ? "包裹收据" : finalLanguage1 == 2 ? "Delivery receipt" : "Reçu de livraison");
+ tEmail.setOrderId(orderId);
+ tEmail.setCreateTime(new Date());
+ int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
+ String week = EmailUtil.getWeek(finalLanguage1, i);
+ tEmail.setWeek(week);
+ boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
+ if(am){
+ tEmail.setAmOrPm(finalLanguage1 ==1?"上午": finalLanguage1 ==2?"morning":"matin");
+ }else {
+ tEmail.setAmOrPm(finalLanguage1 ==1?"下午": finalLanguage1 ==2?"afternoon":"après-midi");
+ }
+ emailService.insert(tEmail);
+ }
+ }catch (Exception e){
+ e.printStackTrace();
}
- Element cp_french = document.getElementById("cp_french");
- cp_french.text("Plaque: GS " + car.getCarLicensePlate());
- Element pf_french = document.getElementById("pf_french");
- pf_french.text("Note du chauffeur: " + aDouble);
- Element start_address_french = document.getElementById("start_address_french");
- start_address_french.text(orderLogistics.getStartAddress());
- Element end_address_french = document.getElementById("end_address_french");
- end_address_french.text(orderLogistics.getEndAddress());
- Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
- 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 ? "Delivery receipt" : "Reçu de livraison", document.html());
-
- //开始生成pdf收据和html收据
- File file = new File("/home/igotechgh/nginx/html/files/html/");
- if(!file.exists()){
- file.mkdirs();
- }
- file = new File("/home/igotechgh/nginx/html/files/html/parcel_receipt_" + orderId + ".html");
- if(!file.exists()){
- file.createNewFile();
- }
- FileWriter fileWriter = new FileWriter(file);
- fileWriter.write(document.html());
- fileWriter.flush();
- fileWriter.close();
-
- File file1 = new File("/home/igotechgh/nginx/html/files/pdf/");
- if(!file1.exists()){
- file1.mkdirs();
- }
- file1 = new File("/home/igotechgh/nginx/html/files/pdf/parcel_receipt_" + orderId + ".pdf");
- if(!file1.exists()){
- file1.createNewFile();
- }
- try{
- FileOutputStream fileOutputStream = new FileOutputStream(file1);
- HtmlToPdfUtils.convertToPdf("/home/igotechgh/nginx/html/files/html/parcel_receipt_" + orderId + ".html", "I-GO", fileOutputStream);
- }catch (Exception e){
- e.printStackTrace();
- System.out.println("html转pdf异常");
- }
-
- String link ="https://igo.i-go.group/files/html/parcel_receipt_" + orderId + ".html";
- TEmail tEmail = new TEmail();
- tEmail.setLink(link);
- tEmail.setUserId(userInfo.getId());
- tEmail.setType(1);
- tEmail.setName(language == 1 ? "包裹收据" : language == 2 ? "Delivery receipt" : "Reçu de livraison");
- tEmail.setOrderId(orderId);
- tEmail.setCreateTime(new Date());
- int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
- String week = EmailUtil.getWeek(language, i);
- tEmail.setWeek(week);
- boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
- if(am){
- tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
- }else {
- tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
- }
- emailService.insert(tEmail);
- }
+ }).start();
}
@@ -1697,21 +1766,20 @@
}
- if(orderLogistics.getIsplatPay()==1){
- //添加已收入明细
- Company company = companyService.selectById(orderLogistics.getCompanyId());
- Double speMoney = company.getSpeMoney();
- BigDecimal d = null;//企业收入
- BigDecimal c = null;//司机收入
- if(company.getIsSpeFixedOrProportional() == 2){//固定
- d = new BigDecimal(speMoney);
- c = new BigDecimal(orderLogistics.getOrderMoney()).subtract(d);//只有出行金额参与抽成，其余归属司机
- }
- if(company.getIsSpeFixedOrProportional() == 1){//比例
- Double price = orderLogistics.getStartMoney() + orderLogistics.getMileageMoney() + orderLogistics.getWaitMoney() + orderLogistics.getDurationMoney() + orderLogistics.getLongDistanceMoney();
- d = new BigDecimal(price).multiply(new BigDecimal(speMoney).divide(new BigDecimal(100), new MathContext(2, RoundingMode.HALF_EVEN)));
- c = new BigDecimal(orderLogistics.getOrderMoney()).subtract(d).setScale(2, BigDecimal.ROUND_HALF_EVEN);
- }
+ //添加已收入明细
+ Company company = companyService.selectById(orderLogistics.getCompanyId());
+ Double speMoney = company.getSpeMoney();
+ BigDecimal d = null;//企业收入
+ BigDecimal c = null;//司机收入
+ if(company.getIsSpeFixedOrProportional() == 2){//固定
+ d = new BigDecimal(speMoney);
+ c = new BigDecimal(orderLogistics.getOrderMoney()).subtract(d);//只有出行金额参与抽成，其余归属司机
+ }
+ if(company.getIsSpeFixedOrProportional() == 1){//比例
+ Double price = orderLogistics.getStartMoney() + orderLogistics.getMileageMoney() + orderLogistics.getWaitMoney() + orderLogistics.getDurationMoney() + orderLogistics.getLongDistanceMoney();
+ d = new BigDecimal(price).multiply(new BigDecimal(speMoney).divide(new BigDecimal(100), new MathContext(2, RoundingMode.HALF_EVEN)));
+ c = new BigDecimal(orderLogistics.getOrderMoney()).subtract(d).setScale(2, BigDecimal.ROUND_HALF_EVEN);
+ }
// incomeService.saveData(1, orderPrivateCar.getCompanyId(), 2, orderPrivateCar.getId(), 1, d.doubleValue());
// incomeService.saveData(2, orderPrivateCar.getDriverId(), 2, orderPrivateCar.getId(), 1, c.doubleValue());
@@ -1719,51 +1787,109 @@
// 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();
+ settlementDetail.setOrderId(orderId);
+ settlementDetail.setOrderType(4);
+ settlementDetail.setDriverId(driver.getId());
+ settlementDetail.setOrderMoney(orderLogistics.getOrderMoney());
+ settlementDetail.setPrice(d.doubleValue());
+ settlementDetail.setCreateTime(new Date());
+ settlementDetailService.insert(settlementDetail);
-
- //记录司机待结算金额
- if(d.compareTo(new BigDecimal(0)) > 0){
- SettlementDetail settlementDetail = new SettlementDetail();
- settlementDetail.setOrderId(orderId);
- settlementDetail.setOrderType(1);
- settlementDetail.setDriverId(driver.getId());
- settlementDetail.setOrderMoney(orderLogistics.getOrderMoney());
- 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());
- Double maxPrice = jsonObject.getDouble("maxPrice");
- if(null != maxPrice){
- List<SettlementDetail> settlementDetailList = settlementDetailService.selectList(new EntityWrapper<SettlementDetail>().eq("driverId", driver.getId())
- .isNull("settlementRecordId").last(" and DATE_FORMAT(now(), '%Y-%m-%d') = DATE_FORMAT(createTime, '%Y-%m-%d')"));
- BigDecimal total = new BigDecimal(0);
- for (SettlementDetail detail : settlementDetailList) {
- total = total.add(new BigDecimal(detail.getPrice()));
+ SettlementAllocation settlementAllocation = settlementAllocationService.selectOne(null);
+ if(null != settlementAllocation){
+ JSONObject jsonObject = JSON.parseObject(settlementAllocation.getContent());
+ Double maxPrice = jsonObject.getDouble("maxPrice");
+ Integer type1 = jsonObject.getInteger("type");
+ if(null != maxPrice){
+ List<SettlementDetail> settlementDetailList = settlementDetailService.selectList(new EntityWrapper<SettlementDetail>().eq("driverId", driver.getId())
+ .isNull("settlementRecordId").last(" and DATE_FORMAT(now(), '%Y-%m-%d') = DATE_FORMAT(createTime, '%Y-%m-%d')"));
+ BigDecimal total = new BigDecimal(0);
+ for (SettlementDetail detail : settlementDetailList) {
+ total = total.add(new BigDecimal(detail.getPrice()));
+ }
+ //日结算
+ if(maxPrice.compareTo(total.doubleValue()) <= 0){
+ SettlementRecord settlementRecord = settlementRecordService.selectOne(new EntityWrapper<SettlementRecord>().eq("driverId", orderLogistics.getDriverId())
+ .eq("type", type1).eq("paymentStatus", 1).last(" and day = DATE_FORMAT(now(), '%Y-%m-%d')"));
+ if(null == settlementRecord){
+ settlementRecord = new SettlementRecord();
+ settlementRecord.setDay(new Date());
+ settlementRecord.setDriverId(orderLogistics.getDriverId());
+ settlementRecord.setType(type1);
+ settlementRecord.setPaymentStatus(1);
+ settlementRecord.setPayMoney(total.doubleValue());
+ settlementRecord.setInsertTime(new Date());
+ settlementRecordService.insert(settlementRecord);
+ }else{
+ settlementRecord.setPayMoney(settlementRecord.getPayMoney() + total.doubleValue());
+ settlementRecordService.updateById(settlementRecord);
}
- //日结算
- if(maxPrice.compareTo(total.doubleValue()) <= 0){
- SettlementRecord settlementRecord = settlementRecordService.selectOne(new EntityWrapper<SettlementRecord>().eq("driverId", orderLogistics.getDriverId())
- .eq("type", 1).eq("paymentStatus", 1).last(" and day = DATE_FORMAT(now(), '%Y-%m-%d')"));
- if(null == settlementRecord){
- settlementRecord = new SettlementRecord();
- settlementRecord.setDay(new Date());
- settlementRecord.setDriverId(orderLogistics.getDriverId());
- settlementRecord.setType(1);
- settlementRecord.setPaymentStatus(1);
- settlementRecord.setPayMoney(total.doubleValue());
- settlementRecord.setInsertTime(new Date());
- settlementRecordService.insert(settlementRecord);
- }else{
- settlementRecord.setPayMoney(settlementRecord.getPayMoney() + total.doubleValue());
- settlementRecordService.updateById(settlementRecord);
+ for (SettlementDetail detail : settlementDetailList) {
+ detail.setSettlementRecordId(settlementRecord.getId());
+ settlementDetailService.updateById(detail);
+ }
+ //强制司机下班
+ DriverWork driverWork = driverWorkService.selectOne(new EntityWrapper<DriverWork>()
+ .eq("driverId", orderLogistics.getDriverId()).eq("state", 1));
+ if(null != driverWork){
+ driverWork.setEndTime(new Date());
+ driverWork.setState(2);
+ driverWorkService.updateById(driverWork);
+ driver.setState(1);
+ driverService.updateById(driver);
+ Car car = carService.selectById(driver.getCarId());
+ if(!org.apache.shiro.util.StringUtils.hasLength(car.getVehicleId())){
+ car.setVehicleId(UUIDUtil.getRandomCode());
+ carService.updateById(car);
}
- for (SettlementDetail detail : settlementDetailList) {
- detail.setSettlementRecordId(settlementRecord.getId());
- settlementDetailService.updateById(detail);
- }
+
+ //司机下班，修改谷歌上的车辆信息
+ new Thread(()->{
+ try {
+ CarModel carModel = carModelMapper.selectById(car.getCarModelId());
+ String vehicles = fleetEngineUtil.getVehicles(car.getVehicleId());
+ if(ToolUtil.isEmpty(vehicles)){
+ boolean createVehicles = fleetEngineUtil.createVehicles(carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
+ if(!createVehicles){
+ for (int i = 0; i < 5; i++) {
+ createVehicles = fleetEngineUtil.createVehicles(carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
+ if(createVehicles){
+ break;
+ }
+ Thread.sleep(5000L);
+ }
+ }
+ boolean updateVehicles = fleetEngineUtil.updateVehicles("OFFLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
+ if(!updateVehicles){
+ for (int i = 0; i < 5; i++) {
+ updateVehicles = fleetEngineUtil.updateVehicles("OFFLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
+ if(updateVehicles){
+ break;
+ }
+ Thread.sleep(5000L);
+ }
+ }
+ }else{
+ boolean updateVehicles = fleetEngineUtil.updateVehicles("OFFLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
+ if(!updateVehicles){
+ for (int i = 0; i < 5; i++) {
+ updateVehicles = fleetEngineUtil.updateVehicles("OFFLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
+ if(updateVehicles){
+ break;
+ }
+ Thread.sleep(5000L);
+ }
+ }
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }).start();
}
}
}
@@ -1779,7 +1905,50 @@
public void run() {
pushUtil.pushOrderState(1, orderLogistics.getUserId(), orderLogistics.getId(), orderLogistics.getType(), orderLogistics.getState(), 0, "");
pushUtil.pushOrderState(2, orderLogistics.getDriverId(), orderLogistics.getId(), orderLogistics.getType(), orderLogistics.getState(), 0, "");
- pushUtil.pushOfflinePayment(2, orderLogistics.getDriverId(), orderLogistics.getId(), 4, orderLogistics.getPayMoney());
+ Integer language1 = driver.getLanguage();
+ String text = "";
+ switch (language1){
+ case 1:
+ text = "客户已选择支付现金，因此您必须收款。确定您已收到此订单费用：现金GHS " + orderLogistics.getPayMoney();
+ break;
+ case 2:
+ text = "The client chose to pay in cash, so you must collect the payment.Confirm if you received the charge for this order: Cash GHS " + orderLogistics.getPayMoney();
+ break;
+ 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 " + orderLogistics.getPayMoney();
+ break;
+
+ }
+ String audioUrl = "";
+ String fileName = "offlinePayment" + orderLogistics.getDriverId() + UUIDUtil.getRandomCode(5) + ".mp3";
+ try {
+ audioUrl = TextToSpeechUtil.create(language1 == 1 ? "cmn-CN" : language1 == 2 ? "en-US" : "fr-FR", text, fileName);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ //定时任务删除语音文件
+ new Timer().schedule(new TimerTask() {
+ @Override
+ public void run() {
+ try {
+ // 使用Runtime执行命令
+ Process process = Runtime.getRuntime().exec("sudo rm -rf /home/igotechgh/nginx/html/files/audio/" + fileName);
+ // 读取命令的输出
+ BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
+ String line;
+ while ((line = reader.readLine()) != null) {
+ System.out.println(line);
+ }
+ // 等待命令执行完成
+ process.waitFor();
+ // 关闭流
+ reader.close();
+ } catch (IOException | InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
+ }, 30000);
+ pushUtil.pushOfflinePayment(2, orderLogistics.getDriverId(), orderLogistics.getId(), 4, orderLogistics.getPayMoney(), audioUrl);
}
}).start();
@@ -1788,404 +1957,405 @@
"Vous avez payé la commande de livraison avec succès, merci d’utiliser I-GO", uid, 1);
language = userInfo.getLanguage();
- String payTypeChinese = "";
- String payTypeEnglish = "";
- String payTypeFrench = "";
- if(orderLogistics.getPayType() == 3){
- payTypeChinese = "现金";
- payTypeEnglish = "Cash";
- payTypeFrench = "En espèces";
- }
-
- if(ToolUtil.isNotEmpty(userInfo.getEmail())){
- String path = templatePath + "user/receiptLogistics.html";
- Document document = Jsoup.parse(new File(path), "UTF-8");
- SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
- SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
- Car car = carMapper.selectById(orderLogistics.getCarId());
- Double aDouble = 0D;
- if(null != orderLogistics.getDriverId()){
- aDouble = orderEvaluateService.queryDriverScore(orderLogistics.getDriverId());
- }
- if(1 == language){
- document.getElementById("english").remove();
- document.getElementById("french").remove();
- document.getElementsByTag("title").get(0).text("包裹收据");
- Element title_chinese = document.getElementById("title_chinese");
- title_chinese.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，您在I-GO此订单消费GHS " + orderLogistics.getPayMoney());
- Element qbj_chinese = document.getElementById("qbj_chinese");
- qbj_chinese.text("GHS " + new BigDecimal(orderLogistics.getStartMoney()).setScale(2, RoundingMode.HALF_EVEN));
- Element scf_chinese = document.getElementById("scf_chinese");
- if(null != orderLogistics.getDurationMoney() && orderLogistics.getDurationMoney() > 0){
- scf_chinese.text("GHS " + new BigDecimal(orderLogistics.getDurationMoney()).setScale(2, RoundingMode.HALF_EVEN));
- }else{
- Element scf_chinese_div = document.getElementById("scf_chinese_div");
- scf_chinese_div.remove();
- }
- Element lcf_chinese = document.getElementById("lcf_chinese");
- if(null != orderLogistics.getMileageMoney() && orderLogistics.getMileageMoney() > 0){
- lcf_chinese.text("GHS " + new BigDecimal(orderLogistics.getMileageMoney()).setScale(2, RoundingMode.HALF_EVEN));
- }else{
- Element lcf_chinese_div = document.getElementById("lcf_chinese_div");
- lcf_chinese_div.remove();
- }
- Element ddf_chinese = document.getElementById("ddf_chinese");
- if(null != orderLogistics.getWaitMoney() && orderLogistics.getWaitMoney() > 0){
- ddf_chinese.text("GHS " + new BigDecimal(orderLogistics.getWaitMoney()).setScale(2, RoundingMode.HALF_EVEN));
- }else{
- Element ddf_chinese_div = document.getElementById("ddf_chinese_div");
- ddf_chinese_div.remove();
- }
- Element glf_chinese = document.getElementById("glf_chinese");
- if(null != orderLogistics.getRoadTollMoney() && orderLogistics.getRoadTollMoney() > 0){
- glf_chinese.text("GHS " + new BigDecimal(orderLogistics.getRoadTollMoney()).setScale(2, RoundingMode.HALF_EVEN));
- }else{
- Element glf_chinese_div = document.getElementById("glf_chinese_div");
- glf_chinese_div.remove();
- }
- Element tcf_chinese = document.getElementById("tcf_chinese");
- if(null != orderLogistics.getParkMoney() && orderLogistics.getParkMoney() > 0){
- tcf_chinese.text("GHS " + new BigDecimal(orderLogistics.getParkMoney()).setScale(2, RoundingMode.HALF_EVEN));
- }else{
- Element tcf_chinese_div = document.getElementById("tcf_chinese_div");
- tcf_chinese_div.remove();
- }
- Element bcj_chinese = document.getElementById("bcj_chinese");
- if(null != orderLogistics.getPriceDifference() && orderLogistics.getPriceDifference() > 0){
- bcj_chinese.text("GHS " + new BigDecimal(orderLogistics.getPriceDifference()).setScale(2, RoundingMode.HALF_EVEN));
- }else{
- Element bcj_chinese_div = document.getElementById("bcj_chinese_div");
- bcj_chinese_div.remove();
- }
- if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
- Element yhq_chinese = document.getElementById("yhq_chinese");
- yhq_chinese.text("GHS -" + new BigDecimal(orderLogistics.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
- }else{
- Element yhq_chinese_div = document.getElementById("yhq_chinese_div");
- yhq_chinese_div.remove();
- }
- if(null != orderLogistics.getDiscountMoney() && orderLogistics.getDiscountMoney() > 0){
- Element zk_chinese = document.getElementById("zk_chinese");
- zk_chinese.text("GHS -" + new BigDecimal(orderLogistics.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
- }else{
- Element zk_chinese_div = document.getElementById("zk_chinese_div");
- zk_chinese_div.remove();
- }
- if(null != orderLogistics.getRedPacketMoney() && orderLogistics.getRedPacketMoney() > 0){
- Element hb_chinese = document.getElementById("hb_chinese");
- hb_chinese.text("GHS -" + new BigDecimal(orderLogistics.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
- }else{
- Element hb_chinese_div = document.getElementById("hb_chinese_div");
- hb_chinese_div.remove();
- }
- Element xj_chinese = document.getElementById("xj_chinese");
- xj_chinese.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
- Element pay_type_chinese = document.getElementById("pay_type_chinese");
- pay_type_chinese.text(payTypeChinese);
- Element pay_money_chinese = document.getElementById("pay_money_chinese");
- pay_money_chinese.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
- Element dispute_chinese = document.getElementById("dispute_chinese");
- if(null != orderLogistics.getIsDispute() && orderLogistics.getIsDispute() == 1){
- dispute_chinese.text("（注意: 争议订单，经过三方协商，平台最终定价为 GHS" + new BigDecimal(orderLogistics.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN) + "）");
- }else{
- dispute_chinese.remove();
- }
- Element pdf_chinese = document.getElementById("pdf_chinese");
- pdf_chinese.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
- 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=4");
+ Integer finalLanguage = language;
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ if(ToolUtil.isNotEmpty(userInfo.getEmail())){
+ String path = templatePath + "user/receiptLogistics.html";
+ Document document = Jsoup.parse(new File(path), "UTF-8");
+ SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
+ SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ Car car = carMapper.selectById(orderLogistics.getCarId());
+ Double aDouble = 0D;
+ if(null != orderLogistics.getDriverId()){
+ aDouble = orderEvaluateService.queryDriverScore(orderLogistics.getDriverId());
+ }
+ if(1 == finalLanguage){
+ document.getElementById("english").remove();
+ document.getElementById("french").remove();
+ document.getElementsByTag("title").get(0).text("包裹收据");
+ Element title_chinese = document.getElementById("title_chinese");
+ title_chinese.text(DateUtil.conversionFormat(finalLanguage, sdf2.format(orderLogistics.getTravelTime())) + "，您在I-GO此订单消费GHS " + orderLogistics.getPayMoney());
+ Element qbj_chinese = document.getElementById("qbj_chinese");
+ qbj_chinese.text("GHS " + new BigDecimal(orderLogistics.getStartMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element scf_chinese = document.getElementById("scf_chinese");
+ if(null != orderLogistics.getDurationMoney() && orderLogistics.getDurationMoney() > 0){
+ scf_chinese.text("GHS " + new BigDecimal(orderLogistics.getDurationMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element scf_chinese_div = document.getElementById("scf_chinese_div");
+ scf_chinese_div.remove();
+ }
+ Element lcf_chinese = document.getElementById("lcf_chinese");
+ if(null != orderLogistics.getMileageMoney() && orderLogistics.getMileageMoney() > 0){
+ lcf_chinese.text("GHS " + new BigDecimal(orderLogistics.getMileageMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element lcf_chinese_div = document.getElementById("lcf_chinese_div");
+ lcf_chinese_div.remove();
+ }
+ Element ddf_chinese = document.getElementById("ddf_chinese");
+ if(null != orderLogistics.getWaitMoney() && orderLogistics.getWaitMoney() > 0){
+ ddf_chinese.text("GHS " + new BigDecimal(orderLogistics.getWaitMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element ddf_chinese_div = document.getElementById("ddf_chinese_div");
+ ddf_chinese_div.remove();
+ }
+ Element glf_chinese = document.getElementById("glf_chinese");
+ if(null != orderLogistics.getRoadTollMoney() && orderLogistics.getRoadTollMoney() > 0){
+ glf_chinese.text("GHS " + new BigDecimal(orderLogistics.getRoadTollMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element glf_chinese_div = document.getElementById("glf_chinese_div");
+ glf_chinese_div.remove();
+ }
+ Element tcf_chinese = document.getElementById("tcf_chinese");
+ if(null != orderLogistics.getParkMoney() && orderLogistics.getParkMoney() > 0){
+ tcf_chinese.text("GHS " + new BigDecimal(orderLogistics.getParkMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element tcf_chinese_div = document.getElementById("tcf_chinese_div");
+ tcf_chinese_div.remove();
+ }
+ Element bcj_chinese = document.getElementById("bcj_chinese");
+ if(null != orderLogistics.getPriceDifference() && orderLogistics.getPriceDifference() > 0){
+ bcj_chinese.text("GHS " + new BigDecimal(orderLogistics.getPriceDifference()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element bcj_chinese_div = document.getElementById("bcj_chinese_div");
+ bcj_chinese_div.remove();
+ }
+ if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
+ Element yhq_chinese = document.getElementById("yhq_chinese");
+ yhq_chinese.text("GHS -" + new BigDecimal(orderLogistics.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element yhq_chinese_div = document.getElementById("yhq_chinese_div");
+ yhq_chinese_div.remove();
+ }
+ if(null != orderLogistics.getDiscountMoney() && orderLogistics.getDiscountMoney() > 0){
+ Element zk_chinese = document.getElementById("zk_chinese");
+ zk_chinese.text("GHS -" + new BigDecimal(orderLogistics.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element zk_chinese_div = document.getElementById("zk_chinese_div");
+ zk_chinese_div.remove();
+ }
+ if(null != orderLogistics.getRedPacketMoney() && orderLogistics.getRedPacketMoney() > 0){
+ Element hb_chinese = document.getElementById("hb_chinese");
+ hb_chinese.text("GHS -" + new BigDecimal(orderLogistics.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element hb_chinese_div = document.getElementById("hb_chinese_div");
+ hb_chinese_div.remove();
+ }
+ Element xj_chinese = document.getElementById("xj_chinese");
+ xj_chinese.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element pay_type_chinese = document.getElementById("pay_type_chinese");
+ pay_type_chinese.text("现金");
+ Element pay_money_chinese = document.getElementById("pay_money_chinese");
+ pay_money_chinese.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element dispute_chinese = document.getElementById("dispute_chinese");
+ if(null != orderLogistics.getIsDispute() && orderLogistics.getIsDispute() == 1){
+ dispute_chinese.text("（注意: 争议订单，经过三方协商，平台最终定价为 GHS" + new BigDecimal(orderLogistics.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN) + "）");
+ }else{
+ dispute_chinese.remove();
+ }
+ Element pdf_chinese = document.getElementById("pdf_chinese");
+ pdf_chinese.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
+ Element lost_item_chinese = document.getElementById("lost_item_chinese");
+ lost_item_chinese.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + finalLanguage + "&orderId=" + orderId + "&orderType=4");
// Element track_chinese = document.getElementById("track_chinese");
// track_chinese.attr("href", "https://igo.i-go.group/mailbox/user/location.html");
- Element pay_time_chinese = document.getElementById("pay_time_chinese");
- pay_time_chinese.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime())));
- Elements driver_chinese = document.getElementsByClass("driver_chinese");
- for (int i = 0; i < driver_chinese.size(); i++) {
- Element element = driver_chinese.get(i);
- element.text(" " + driver.getFirstName() + "." + driver.getLastName());
- }
- Element cp_chinese = document.getElementById("cp_chinese");
- cp_chinese.text("车牌：" + car.getCarLicensePlate());
- Element pf_chinese = document.getElementById("pf_chinese");
- pf_chinese.text("司机评分：" + aDouble);
- Element start_address_chinese = document.getElementById("start_address_chinese");
- start_address_chinese.text(orderLogistics.getStartAddress());
- Element end_address_chinese = document.getElementById("end_address_chinese");
- end_address_chinese.text(orderLogistics.getEndAddress());
- Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
- Element server_tel_chinese = document.getElementById("server_tel_chinese");
- server_tel_chinese.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
- }
- if(2 == language){
- document.getElementById("chinese").remove();
- document.getElementById("french").remove();
- document.getElementsByTag("title").get(0).text("Delivery receipt");
- Element title_english = document.getElementById("title_english");
- title_english.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，You spent GHS " + orderLogistics.getPayMoney() + " on the trip ");
- Element qbj_english = document.getElementById("qbj_english");
- qbj_english.text("GHS " + new BigDecimal(orderLogistics.getStartMoney()).setScale(2, RoundingMode.HALF_EVEN));
- Element scf_english = document.getElementById("scf_english");
- if(null != orderLogistics.getDurationMoney() && orderLogistics.getDurationMoney() > 0){
- scf_english.text("GHS " + new BigDecimal(orderLogistics.getDurationMoney()).setScale(2, RoundingMode.HALF_EVEN));
- }else{
- Element scf_english_div = document.getElementById("scf_english_div");
- scf_english_div.remove();
- }
- Element lcf_english = document.getElementById("lcf_english");
- if(null != orderLogistics.getMileageMoney() && orderLogistics.getMileageMoney() > 0){
- lcf_english.text("GHS " + new BigDecimal(orderLogistics.getMileageMoney()).setScale(2, RoundingMode.HALF_EVEN));
- }else{
- Element lcf_english_div = document.getElementById("lcf_english_div");
- lcf_english_div.remove();
- }
- Element ddf_english = document.getElementById("ddf_english");
- if(null != orderLogistics.getWaitMoney() && orderLogistics.getWaitMoney() > 0){
- ddf_english.text("GHS " + new BigDecimal(orderLogistics.getWaitMoney()).setScale(2, RoundingMode.HALF_EVEN));
- }else{
- Element ddf_english_div = document.getElementById("ddf_english_div");
- ddf_english_div.remove();
- }
- Element glf_english = document.getElementById("glf_english");
- if(null != orderLogistics.getRoadTollMoney() && orderLogistics.getRoadTollMoney() > 0){
- glf_english.text("GHS " + new BigDecimal(orderLogistics.getRoadTollMoney()).setScale(2, RoundingMode.HALF_EVEN));
- }else{
- Element glf_english_div = document.getElementById("glf_english_div");
- glf_english_div.remove();
- }
- Element tcf_english = document.getElementById("tcf_english");
- if(null != orderLogistics.getParkMoney() && orderLogistics.getParkMoney() > 0){
- tcf_english.text("GHS " + new BigDecimal(orderLogistics.getParkMoney()).setScale(2, RoundingMode.HALF_EVEN));
- }else{
- Element tcf_english_div = document.getElementById("tcf_english_div");
- tcf_english_div.remove();
- }
- Element bcj_english = document.getElementById("bcj_english");
- if(null != orderLogistics.getPriceDifference() && orderLogistics.getPriceDifference() > 0){
- bcj_english.text("GHS " + new BigDecimal(orderLogistics.getPriceDifference()).setScale(2, RoundingMode.HALF_EVEN));
- }else{
- Element bcj_english_div = document.getElementById("bcj_english_div");
- bcj_english_div.remove();
- }
- if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
- Element yhq_english = document.getElementById("yhq_english");
- yhq_english.text("GHS -" + new BigDecimal(orderLogistics.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
- }else{
- Element yhq_english_div = document.getElementById("yhq_english_div");
- yhq_english_div.remove();
- }
- if(null != orderLogistics.getDiscountMoney() && orderLogistics.getDiscountMoney() > 0){
- Element zk_english = document.getElementById("zk_english");
- zk_english.text("GHS -" + new BigDecimal(orderLogistics.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
- }else{
- Element zk_english_div = document.getElementById("zk_english_div");
- zk_english_div.remove();
- }
- if(null != orderLogistics.getRedPacketMoney() && orderLogistics.getRedPacketMoney() > 0){
- Element hb_english = document.getElementById("hb_english");
- hb_english.text("GHS -" + new BigDecimal(orderLogistics.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
- }else{
- Element hb_english_div = document.getElementById("hb_english_div");
- hb_english_div.remove();
- }
- Element xj_english = document.getElementById("xj_english");
- xj_english.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
- Element pay_type_english = document.getElementById("pay_type_english");
- pay_type_english.text(payTypeEnglish);
- Element pay_money_english = document.getElementById("pay_money_english");
- pay_money_english.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
- Element dispute_english = document.getElementById("dispute_english");
- if(null != orderLogistics.getIsDispute() && orderLogistics.getIsDispute() == 1){
- dispute_english.text("（Note: Disputed order, after tripartite negotiation, the final pricing of the platform is GHS " + new BigDecimal(orderLogistics.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN) + "）");
- }else{
- dispute_english.remove();
- }
- Element pdf_english = document.getElementById("pdf_english");
- pdf_english.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
- 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=4");
+ Element pay_time_chinese = document.getElementById("pay_time_chinese");
+ pay_time_chinese.text(DateUtil.conversionFormat(finalLanguage, sdf1.format(orderLogistics.getTravelTime())));
+ Elements driver_chinese = document.getElementsByClass("driver_chinese");
+ for (int i = 0; i < driver_chinese.size(); i++) {
+ Element element = driver_chinese.get(i);
+ element.text(" " + driver.getFirstName() + "." + driver.getLastName());
+ }
+ Element cp_chinese = document.getElementById("cp_chinese");
+ cp_chinese.text("车牌：" + car.getCarLicensePlate());
+ Element pf_chinese = document.getElementById("pf_chinese");
+ pf_chinese.text("司机评分：" + aDouble);
+ Element start_address_chinese = document.getElementById("start_address_chinese");
+ start_address_chinese.text(orderLogistics.getStartAddress());
+ Element end_address_chinese = document.getElementById("end_address_chinese");
+ end_address_chinese.text(orderLogistics.getEndAddress());
+ Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
+ Element server_tel_chinese = document.getElementById("server_tel_chinese");
+ server_tel_chinese.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
+ }
+ if(2 == finalLanguage){
+ document.getElementById("chinese").remove();
+ document.getElementById("french").remove();
+ document.getElementsByTag("title").get(0).text("Delivery receipt");
+ Element title_english = document.getElementById("title_english");
+ title_english.text(DateUtil.conversionFormat(finalLanguage, sdf2.format(orderLogistics.getTravelTime())) + "，You spent GHS " + orderLogistics.getPayMoney() + " on the trip ");
+ Element qbj_english = document.getElementById("qbj_english");
+ qbj_english.text("GHS " + new BigDecimal(orderLogistics.getStartMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element scf_english = document.getElementById("scf_english");
+ if(null != orderLogistics.getDurationMoney() && orderLogistics.getDurationMoney() > 0){
+ scf_english.text("GHS " + new BigDecimal(orderLogistics.getDurationMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element scf_english_div = document.getElementById("scf_english_div");
+ scf_english_div.remove();
+ }
+ Element lcf_english = document.getElementById("lcf_english");
+ if(null != orderLogistics.getMileageMoney() && orderLogistics.getMileageMoney() > 0){
+ lcf_english.text("GHS " + new BigDecimal(orderLogistics.getMileageMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element lcf_english_div = document.getElementById("lcf_english_div");
+ lcf_english_div.remove();
+ }
+ Element ddf_english = document.getElementById("ddf_english");
+ if(null != orderLogistics.getWaitMoney() && orderLogistics.getWaitMoney() > 0){
+ ddf_english.text("GHS " + new BigDecimal(orderLogistics.getWaitMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element ddf_english_div = document.getElementById("ddf_english_div");
+ ddf_english_div.remove();
+ }
+ Element glf_english = document.getElementById("glf_english");
+ if(null != orderLogistics.getRoadTollMoney() && orderLogistics.getRoadTollMoney() > 0){
+ glf_english.text("GHS " + new BigDecimal(orderLogistics.getRoadTollMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element glf_english_div = document.getElementById("glf_english_div");
+ glf_english_div.remove();
+ }
+ Element tcf_english = document.getElementById("tcf_english");
+ if(null != orderLogistics.getParkMoney() && orderLogistics.getParkMoney() > 0){
+ tcf_english.text("GHS " + new BigDecimal(orderLogistics.getParkMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element tcf_english_div = document.getElementById("tcf_english_div");
+ tcf_english_div.remove();
+ }
+ Element bcj_english = document.getElementById("bcj_english");
+ if(null != orderLogistics.getPriceDifference() && orderLogistics.getPriceDifference() > 0){
+ bcj_english.text("GHS " + new BigDecimal(orderLogistics.getPriceDifference()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element bcj_english_div = document.getElementById("bcj_english_div");
+ bcj_english_div.remove();
+ }
+ if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
+ Element yhq_english = document.getElementById("yhq_english");
+ yhq_english.text("GHS -" + new BigDecimal(orderLogistics.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element yhq_english_div = document.getElementById("yhq_english_div");
+ yhq_english_div.remove();
+ }
+ if(null != orderLogistics.getDiscountMoney() && orderLogistics.getDiscountMoney() > 0){
+ Element zk_english = document.getElementById("zk_english");
+ zk_english.text("GHS -" + new BigDecimal(orderLogistics.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element zk_english_div = document.getElementById("zk_english_div");
+ zk_english_div.remove();
+ }
+ if(null != orderLogistics.getRedPacketMoney() && orderLogistics.getRedPacketMoney() > 0){
+ Element hb_english = document.getElementById("hb_english");
+ hb_english.text("GHS -" + new BigDecimal(orderLogistics.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element hb_english_div = document.getElementById("hb_english_div");
+ hb_english_div.remove();
+ }
+ Element xj_english = document.getElementById("xj_english");
+ xj_english.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element pay_type_english = document.getElementById("pay_type_english");
+ pay_type_english.text("Cash");
+ Element pay_money_english = document.getElementById("pay_money_english");
+ pay_money_english.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element dispute_english = document.getElementById("dispute_english");
+ if(null != orderLogistics.getIsDispute() && orderLogistics.getIsDispute() == 1){
+ dispute_english.text("（Note: Disputed order, after tripartite negotiation, the final pricing of the platform is GHS " + new BigDecimal(orderLogistics.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN) + "）");
+ }else{
+ dispute_english.remove();
+ }
+ Element pdf_english = document.getElementById("pdf_english");
+ pdf_english.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
+ Element lost_item_english = document.getElementById("lost_item_english");
+ lost_item_english.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + finalLanguage + "&orderId=" + orderId + "&orderType=4");
// Element track_english = document.getElementById("track_english");
// track_english.attr("href", "https://igo.i-go.group/mailbox/user/location.html");
- Element pay_time_english = document.getElementById("pay_time_english");
- pay_time_english.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime())));
- Elements driver_english = document.getElementsByClass("driver_english");
- for (int i = 0; i < driver_english.size(); i++) {
- Element element = driver_english.get(i);
- element.text(" " + driver.getFirstName() + "." + driver.getLastName());
- }
- Element cp_english = document.getElementById("cp_english");
- cp_english.text("Number Plate：" + car.getCarLicensePlate());
- Element pf_english = document.getElementById("pf_english");
- pf_english.text("Driver Rating：" + aDouble);
- Element start_address_english = document.getElementById("start_address_english");
- start_address_english.text(orderLogistics.getStartAddress());
- Element end_address_english = document.getElementById("end_address_english");
- end_address_english.text(orderLogistics.getEndAddress());
- Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
- Element server_tel_english = document.getElementById("server_tel_english");
- server_tel_english.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
- }
- if(3 == language){
- document.getElementById("chinese").remove();
- document.getElementById("english").remove();
- document.getElementsByTag("title").get(0).text("Reçu de livraison");
- Element title_french = document.getElementById("title_french");
- title_french.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，Vous consommez GHS " + orderLogistics.getPayMoney() + " sur votre commande I-GO ");
- Element qbj_french = document.getElementById("qbj_french");
- qbj_french.text("GHS " + new BigDecimal(orderLogistics.getStartMoney()).setScale(2, RoundingMode.HALF_EVEN));
- Element scf_french = document.getElementById("scf_french");
- if(null != orderLogistics.getDurationMoney() && orderLogistics.getDurationMoney() > 0){
- scf_french.text("GHS " + new BigDecimal(orderLogistics.getDurationMoney()).setScale(2, RoundingMode.HALF_EVEN));
- }else{
- Element scf_french_div = document.getElementById("scf_french_div");
- scf_french_div.remove();
- }
- Element lcf_french = document.getElementById("lcf_french");
- if(null != orderLogistics.getMileageMoney() && orderLogistics.getMileageMoney() > 0){
- lcf_french.text("GHS " + new BigDecimal(orderLogistics.getMileageMoney()).setScale(2, RoundingMode.HALF_EVEN));
- }else{
- Element lcf_french_div = document.getElementById("lcf_french_div");
- lcf_french_div.remove();
- }
- Element ddf_french = document.getElementById("ddf_french");
- if(null != orderLogistics.getWaitMoney() && orderLogistics.getWaitMoney() > 0){
- ddf_french.text("GHS " + new BigDecimal(orderLogistics.getWaitMoney()).setScale(2, RoundingMode.HALF_EVEN));
- }else{
- Element ddf_french_div = document.getElementById("ddf_french_div");
- ddf_french_div.remove();
- }
- Element glf_french = document.getElementById("glf_french");
- if(null != orderLogistics.getRoadTollMoney() && orderLogistics.getRoadTollMoney() > 0){
- glf_french.text("GHS " + new BigDecimal(orderLogistics.getRoadTollMoney()).setScale(2, RoundingMode.HALF_EVEN));
- }else{
- Element glf_french_div = document.getElementById("glf_french_div");
- glf_french_div.remove();
- }
- Element tcf_french = document.getElementById("tcf_french");
- if(null != orderLogistics.getParkMoney() && orderLogistics.getParkMoney() > 0){
- tcf_french.text("GHS " + new BigDecimal(orderLogistics.getParkMoney()).setScale(2, RoundingMode.HALF_EVEN));
- }else{
- Element tcf_french_div = document.getElementById("tcf_french_div");
- tcf_french_div.remove();
- }
- Element bcj_french = document.getElementById("bcj_french");
- if(null != orderLogistics.getPriceDifference() && orderLogistics.getPriceDifference() > 0){
- bcj_french.text("GHS " + new BigDecimal(orderLogistics.getPriceDifference()).setScale(2, RoundingMode.HALF_EVEN));
- }else{
- Element bcj_french_div = document.getElementById("bcj_french_div");
- bcj_french_div.remove();
- }
- if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
- Element yhq_french = document.getElementById("yhq_french");
- yhq_french.text("GHS -" + new BigDecimal(orderLogistics.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
- }else{
- Element yhq_french_div = document.getElementById("yhq_french_div");
- yhq_french_div.remove();
- }
- if(null != orderLogistics.getDiscountMoney() && orderLogistics.getDiscountMoney() > 0){
- Element zk_french = document.getElementById("zk_french");
- zk_french.text("GHS -" + new BigDecimal(orderLogistics.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
- }else{
- Element zk_french_div = document.getElementById("zk_french_div");
- zk_french_div.remove();
- }
- if(null != orderLogistics.getRedPacketMoney() && orderLogistics.getRedPacketMoney() > 0){
- Element hb_french = document.getElementById("hb_french");
- hb_french.text("GHS -" + new BigDecimal(orderLogistics.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
- }else{
- Element hb_french_div = document.getElementById("hb_french_div");
- hb_french_div.remove();
- }
- Element xj_french = document.getElementById("xj_french");
- xj_french.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
- Element pay_type_french = document.getElementById("pay_type_french");
- pay_type_french.text(payTypeFrench);
- Element pay_money_french = document.getElementById("pay_money_french");
- pay_money_french.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
- Element dispute_french = document.getElementById("dispute_french");
- if(null != orderLogistics.getIsDispute() && orderLogistics.getIsDispute() == 1){
- dispute_french.text("（Remarque: Il s’agit d’une commande contestée, et après des négociations entre trois parties, la plateforme l’a finalement tarifée à GHS " + new BigDecimal(orderLogistics.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN) + "）");
- }else{
- dispute_french.remove();
- }
- Element pdf_french = document.getElementById("pdf_french");
- pdf_french.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
- 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=4");
+ Element pay_time_english = document.getElementById("pay_time_english");
+ pay_time_english.text(DateUtil.conversionFormat(finalLanguage, sdf1.format(orderLogistics.getTravelTime())));
+ Elements driver_english = document.getElementsByClass("driver_english");
+ for (int i = 0; i < driver_english.size(); i++) {
+ Element element = driver_english.get(i);
+ element.text(" " + driver.getFirstName() + "." + driver.getLastName());
+ }
+ Element cp_english = document.getElementById("cp_english");
+ cp_english.text("Number Plate：" + car.getCarLicensePlate());
+ Element pf_english = document.getElementById("pf_english");
+ pf_english.text("Driver Rating：" + aDouble);
+ Element start_address_english = document.getElementById("start_address_english");
+ start_address_english.text(orderLogistics.getStartAddress());
+ Element end_address_english = document.getElementById("end_address_english");
+ end_address_english.text(orderLogistics.getEndAddress());
+ Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
+ Element server_tel_english = document.getElementById("server_tel_english");
+ server_tel_english.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
+ }
+ if(3 == finalLanguage){
+ document.getElementById("chinese").remove();
+ document.getElementById("english").remove();
+ document.getElementsByTag("title").get(0).text("Reçu de livraison");
+ Element title_french = document.getElementById("title_french");
+ title_french.text(DateUtil.conversionFormat(finalLanguage, sdf2.format(orderLogistics.getTravelTime())) + "，Vous consommez GHS " + orderLogistics.getPayMoney() + " sur votre commande I-GO ");
+ Element qbj_french = document.getElementById("qbj_french");
+ qbj_french.text("GHS " + new BigDecimal(orderLogistics.getStartMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element scf_french = document.getElementById("scf_french");
+ if(null != orderLogistics.getDurationMoney() && orderLogistics.getDurationMoney() > 0){
+ scf_french.text("GHS " + new BigDecimal(orderLogistics.getDurationMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element scf_french_div = document.getElementById("scf_french_div");
+ scf_french_div.remove();
+ }
+ Element lcf_french = document.getElementById("lcf_french");
+ if(null != orderLogistics.getMileageMoney() && orderLogistics.getMileageMoney() > 0){
+ lcf_french.text("GHS " + new BigDecimal(orderLogistics.getMileageMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element lcf_french_div = document.getElementById("lcf_french_div");
+ lcf_french_div.remove();
+ }
+ Element ddf_french = document.getElementById("ddf_french");
+ if(null != orderLogistics.getWaitMoney() && orderLogistics.getWaitMoney() > 0){
+ ddf_french.text("GHS " + new BigDecimal(orderLogistics.getWaitMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element ddf_french_div = document.getElementById("ddf_french_div");
+ ddf_french_div.remove();
+ }
+ Element glf_french = document.getElementById("glf_french");
+ if(null != orderLogistics.getRoadTollMoney() && orderLogistics.getRoadTollMoney() > 0){
+ glf_french.text("GHS " + new BigDecimal(orderLogistics.getRoadTollMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element glf_french_div = document.getElementById("glf_french_div");
+ glf_french_div.remove();
+ }
+ Element tcf_french = document.getElementById("tcf_french");
+ if(null != orderLogistics.getParkMoney() && orderLogistics.getParkMoney() > 0){
+ tcf_french.text("GHS " + new BigDecimal(orderLogistics.getParkMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element tcf_french_div = document.getElementById("tcf_french_div");
+ tcf_french_div.remove();
+ }
+ Element bcj_french = document.getElementById("bcj_french");
+ if(null != orderLogistics.getPriceDifference() && orderLogistics.getPriceDifference() > 0){
+ bcj_french.text("GHS " + new BigDecimal(orderLogistics.getPriceDifference()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element bcj_french_div = document.getElementById("bcj_french_div");
+ bcj_french_div.remove();
+ }
+ if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
+ Element yhq_french = document.getElementById("yhq_french");
+ yhq_french.text("GHS -" + new BigDecimal(orderLogistics.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element yhq_french_div = document.getElementById("yhq_french_div");
+ yhq_french_div.remove();
+ }
+ if(null != orderLogistics.getDiscountMoney() && orderLogistics.getDiscountMoney() > 0){
+ Element zk_french = document.getElementById("zk_french");
+ zk_french.text("GHS -" + new BigDecimal(orderLogistics.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element zk_french_div = document.getElementById("zk_french_div");
+ zk_french_div.remove();
+ }
+ if(null != orderLogistics.getRedPacketMoney() && orderLogistics.getRedPacketMoney() > 0){
+ Element hb_french = document.getElementById("hb_french");
+ hb_french.text("GHS -" + new BigDecimal(orderLogistics.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element hb_french_div = document.getElementById("hb_french_div");
+ hb_french_div.remove();
+ }
+ Element xj_french = document.getElementById("xj_french");
+ xj_french.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element pay_type_french = document.getElementById("pay_type_french");
+ pay_type_french.text("En espèces");
+ Element pay_money_french = document.getElementById("pay_money_french");
+ pay_money_french.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ Element dispute_french = document.getElementById("dispute_french");
+ if(null != orderLogistics.getIsDispute() && orderLogistics.getIsDispute() == 1){
+ dispute_french.text("（Remarque: Il s’agit d’une commande contestée, et après des négociations entre trois parties, la plateforme l’a finalement tarifée à GHS " + new BigDecimal(orderLogistics.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN) + "）");
+ }else{
+ dispute_french.remove();
+ }
+ Element pdf_french = document.getElementById("pdf_french");
+ pdf_french.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
+ Element lost_item_french = document.getElementById("lost_item_french");
+ lost_item_french.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + finalLanguage + "&orderId=" + orderId + "&orderType=4");
// Element track_french = document.getElementById("track_french");
// track_french.attr("href", "https://igo.i-go.group/mailbox/user/location.html");
- Element pay_time_french = document.getElementById("pay_time_french");
- pay_time_french.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime())));
- Elements driver_french = document.getElementsByClass("driver_french");
- for (int i = 0; i < driver_french.size(); i++) {
- Element element = driver_french.get(i);
- element.text(" " + driver.getFirstName() + "." + driver.getLastName());
+ Element pay_time_french = document.getElementById("pay_time_french");
+ pay_time_french.text(DateUtil.conversionFormat(finalLanguage, sdf1.format(orderLogistics.getTravelTime())));
+ Elements driver_french = document.getElementsByClass("driver_french");
+ for (int i = 0; i < driver_french.size(); i++) {
+ Element element = driver_french.get(i);
+ element.text(" " + driver.getFirstName() + "." + driver.getLastName());
+ }
+ Element cp_french = document.getElementById("cp_french");
+ cp_french.text("Plaque: GS " + car.getCarLicensePlate());
+ Element pf_french = document.getElementById("pf_french");
+ pf_french.text("Note du chauffeur: " + aDouble);
+ Element start_address_french = document.getElementById("start_address_french");
+ start_address_french.text(orderLogistics.getStartAddress());
+ Element end_address_french = document.getElementById("end_address_french");
+ end_address_french.text(orderLogistics.getEndAddress());
+ Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
+ Element server_tel_french = document.getElementById("server_tel_french");
+ server_tel_french.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
+ }
+
+ EmailUtil.send(userInfo.getEmail(), finalLanguage == 1 ? "包裹收据" : finalLanguage == 2 ? "Delivery receipt" : "Reçu de livraison", document.html());
+
+ //开始生成pdf收据和html收据
+ File file = new File("/home/igotechgh/nginx/html/files/html/");
+ if(!file.exists()){
+ file.mkdirs();
+ }
+ file = new File("/home/igotechgh/nginx/html/files/html/parcel_receipt_" + orderId + ".html");
+ if(!file.exists()){
+ file.createNewFile();
+ }
+ FileWriter fileWriter = new FileWriter(file);
+ fileWriter.write(document.html());
+ fileWriter.flush();
+ fileWriter.close();
+
+ File file1 = new File("/home/igotechgh/nginx/html/files/pdf/");
+ if(!file1.exists()){
+ file1.mkdirs();
+ }
+ file1 = new File("/home/igotechgh/nginx/html/files/pdf/parcel_receipt_" + orderId + ".pdf");
+ if(!file1.exists()){
+ file1.createNewFile();
+ }
+ try{
+ FileOutputStream fileOutputStream = new FileOutputStream(file1);
+ HtmlToPdfUtils.convertToPdf("/home/igotechgh/nginx/html/files/html/parcel_receipt_" + orderId + ".html", "I-GO", fileOutputStream);
+ }catch (Exception e){
+ e.printStackTrace();
+ System.out.println("html转pdf异常");
+ }
+
+ String link ="https://igo.i-go.group/files/html/parcel_receipt_" + orderId + ".html";
+ TEmail tEmail = new TEmail();
+ tEmail.setLink(link);
+ tEmail.setUserId(userInfo.getId());
+ tEmail.setType(1);
+ tEmail.setName(finalLanguage == 1 ? "包裹收据" : finalLanguage == 2 ? "Delivery receipt" : "Reçu de livraison");
+ tEmail.setOrderId(orderId);
+ tEmail.setCreateTime(new Date());
+ int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
+ String week = EmailUtil.getWeek(finalLanguage, i);
+ tEmail.setWeek(week);
+ boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
+ if(am){
+ tEmail.setAmOrPm(finalLanguage ==1?"上午": finalLanguage ==2?"morning":"matin");
+ }else {
+ tEmail.setAmOrPm(finalLanguage ==1?"下午": finalLanguage ==2?"afternoon":"après-midi");
+ }
+ emailService.insert(tEmail);
+ }
+ }catch (Exception e){
+ e.printStackTrace();
}
- Element cp_french = document.getElementById("cp_french");
- cp_french.text("Plaque: GS " + car.getCarLicensePlate());
- Element pf_french = document.getElementById("pf_french");
- pf_french.text("Note du chauffeur: " + aDouble);
- Element start_address_french = document.getElementById("start_address_french");
- start_address_french.text(orderLogistics.getStartAddress());
- Element end_address_french = document.getElementById("end_address_french");
- end_address_french.text(orderLogistics.getEndAddress());
- Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
- 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 ? "Delivery receipt" : "Reçu de livraison", document.html());
-
- //开始生成pdf收据和html收据
- File file = new File("/home/igotechgh/nginx/html/files/html/");
- if(!file.exists()){
- file.mkdirs();
- }
- file = new File("/home/igotechgh/nginx/html/files/html/parcel_receipt_" + orderId + ".html");
- if(!file.exists()){
- file.createNewFile();
- }
- FileWriter fileWriter = new FileWriter(file);
- fileWriter.write(document.html());
- fileWriter.flush();
- fileWriter.close();
-
- File file1 = new File("/home/igotechgh/nginx/html/files/pdf/");
- if(!file1.exists()){
- file1.mkdirs();
- }
- file1 = new File("/home/igotechgh/nginx/html/files/pdf/parcel_receipt_" + orderId + ".pdf");
- if(!file1.exists()){
- file1.createNewFile();
- }
- try{
- FileOutputStream fileOutputStream = new FileOutputStream(file1);
- HtmlToPdfUtils.convertToPdf("/home/igotechgh/nginx/html/files/html/parcel_receipt_" + orderId + ".html", "I-GO", fileOutputStream);
- }catch (Exception e){
- e.printStackTrace();
- System.out.println("html转pdf异常");
- }
-
- String link ="https://igo.i-go.group/files/html/parcel_receipt_" + orderId + ".html";
- TEmail tEmail = new TEmail();
- tEmail.setLink(link);
- tEmail.setUserId(userInfo.getId());
- tEmail.setType(1);
- tEmail.setName(language == 1 ? "包裹收据" : language == 2 ? "Delivery receipt" : "Reçu de livraison");
- tEmail.setOrderId(orderId);
- tEmail.setCreateTime(new Date());
- int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
- String week = EmailUtil.getWeek(language, i);
- tEmail.setWeek(week);
- boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
- if(am){
- tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
- }else {
- tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
- }
- emailService.insert(tEmail);
- }
+ }).start();
}
- this.updateById(orderLogistics);
+ this.updateAllColumnById(orderLogistics);
return resultUtil;
}
@@ -2401,6 +2571,28 @@
query.setState(2);
query.setCode(order_id);
paymentRecordService.updateById(query);
+
+ //添加已收入明细
+ Company company = companyService.selectById(orderLogistics.getCompanyId());
+ Double speMoney = company.getSpeMoney();
+ BigDecimal d = null;//企业收入
+ BigDecimal c = null;//司机收入
+ if(company.getIsSpeFixedOrProportional() == 2){//固定
+ d = new BigDecimal(speMoney);
+ c = new BigDecimal(orderLogistics.getOrderMoney()).subtract(d);//只有出行金额参与抽成，其余归属司机
+ }
+ if(company.getIsSpeFixedOrProportional() == 1){//比例
+ Double price = orderLogistics.getStartMoney() + orderLogistics.getMileageMoney() + orderLogistics.getWaitMoney() + orderLogistics.getDurationMoney() + orderLogistics.getLongDistanceMoney();
+ d = new BigDecimal(price).multiply(new BigDecimal(speMoney).divide(new BigDecimal(100), new MathContext(2, RoundingMode.HALF_EVEN)));
+ c = new BigDecimal(orderLogistics.getOrderMoney()).subtract(d).setScale(2, BigDecimal.ROUND_HALF_EVEN);
+ }
+ incomeService.saveData(1, orderLogistics.getCompanyId(), 2, orderLogistics.getId(), 4, d.doubleValue());
+ incomeService.saveData(2, orderLogistics.getDriverId(), 2, orderLogistics.getId(), 4, c.doubleValue());
+ Driver driver = driverService.selectById(orderLogistics.getDriverId());
+ driver.setBusinessMoney(new BigDecimal(null != driver.getBusinessMoney() ? driver.getBusinessMoney() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+ 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);
// TODO: 2020/5/24 这里需要给司机和用户推送订单状态
new Thread(new Runnable() {
@@ -2417,26 +2609,12 @@
"Vous avez payé la commande de livraison avec succès, merci d’utiliser I-GO", orderLogistics.getUserId(), 1);
language = userInfo.getLanguage();
- String payTypeChinese = "";
- String payTypeEnglish = "";
- String payTypeFrench = "";
- if(orderLogistics.getPayType() == 1){
- payTypeChinese = "手机支付";
- payTypeEnglish = "Mobile money";
- payTypeFrench = "Argent mobile";
- }
- if(orderLogistics.getPayType() == 2){
- payTypeChinese = "银行卡支付";
- payTypeEnglish = "Bank card";
- payTypeFrench = "Carte bancaire";
- }
-
if(ToolUtil.isNotEmpty(userInfo.getEmail())){
String path = templatePath + "user/receiptLogistics.html";
Document document = Jsoup.parse(new File(path), "UTF-8");
SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
- Driver driver = driverService.selectById(orderLogistics.getDriverId());
+ driver = driverService.selectById(orderLogistics.getDriverId());
Car car = carMapper.selectById(orderLogistics.getCarId());
Double aDouble = 0D;
if(null != orderLogistics.getDriverId()){
@@ -2516,7 +2694,7 @@
Element xj_chinese = document.getElementById("xj_chinese");
xj_chinese.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
Element pay_type_chinese = document.getElementById("pay_type_chinese");
- pay_type_chinese.text(payTypeChinese);
+ pay_type_chinese.text(orderLogistics.getPayType() == 1 ? "手机支付" : (orderLogistics.getPayType() == 2?"银行卡支付":(orderLogistics.getPayType() == 3?"余额支付":"现金支付")));
Element pay_money_chinese = document.getElementById("pay_money_chinese");
pay_money_chinese.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
Element dispute_chinese = document.getElementById("dispute_chinese");
@@ -2624,7 +2802,7 @@
Element xj_english = document.getElementById("xj_english");
xj_english.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
Element pay_type_english = document.getElementById("pay_type_english");
- pay_type_english.text(payTypeEnglish);
+ pay_type_english.text(orderLogistics.getPayType() == 1 ? "Mobile money" :(orderLogistics.getPayType() == 2?"Bank card":(orderLogistics.getPayType() == 3?"I-GO Wallet":"Cash")));
Element pay_money_english = document.getElementById("pay_money_english");
pay_money_english.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
Element dispute_english = document.getElementById("dispute_english");
@@ -2732,7 +2910,7 @@
Element xj_french = document.getElementById("xj_french");
xj_french.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
Element pay_type_french = document.getElementById("pay_type_french");
- pay_type_french.text(payTypeFrench);
+ pay_type_french.text(orderLogistics.getPayType() == 1 ? "Argent mobile" : (orderLogistics.getPayType() == 2?"Carte bancaire":(orderLogistics.getPayType() == 3?"Portefeuille I-GO":"En espèces")));
Element pay_money_french = document.getElementById("pay_money_french");
pay_money_french.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
Element dispute_french = document.getElementById("dispute_french");
@@ -3020,9 +3198,20 @@
if(ToolUtil.isNotEmpty(remark)){
if(ToolUtil.isNotEmpty(remark)){
List<SensitiveWords> sensitiveWords = sensitiveWordsMapper.selectList(null);
+ List<String> list = Arrays.asList(remark.split(" "));
for(SensitiveWords s : sensitiveWords){
- remark = remark.replaceAll(s.getContent(), "***");
+ List<String> str = new ArrayList<>();
+ String lowerCase = s.getContent().toLowerCase();
+ for (String s1 : list) {
+ if(lowerCase.equals(s1.toLowerCase())){
+ str.add("***");
+ }else{
+ str.add(s1);
+ }
+ }
+ list = str;
}
+ remark = list.stream().collect(Collectors.joining(" "));
}
}
@@ -3100,11 +3289,25 @@
driverService.updateById(driver);
}
- if((orderLogistics.getState() == 10 || orderLogistics.getState() == 12) && null != orderLogistics.getDriverId()){
+ if(orderLogistics.getState() == 10 || orderLogistics.getState() == 12){
+ Car car = carService.selectById(orderLogistics.getCarId());
//修改行程信息
- fleetEngineUtil.updateTrip("CANCELED", null, null, orderLogistics.getTripId(), null, null, null, null);
+ boolean updateTrip = fleetEngineUtil.updateTrip("CANCELED", (null != car ? car.getVehicleId() : null), null, orderLogistics.getTripId(), null, null, null, null);
+ if(!updateTrip){
+ for (int i = 0; i < 5; i++) {
+ updateTrip = fleetEngineUtil.updateTrip("CANCELED", (null != car ? car.getVehicleId() : null), null, orderLogistics.getTripId(), null, null, null, null);
+ if(updateTrip){
+ orderLogistics.setIsover(1);
+ this.updateById(orderLogistics);
+ break;
+ }
+ Thread.sleep(3000L);
+ }
+ }else{
+ orderLogistics.setIsover(1);
+ this.updateById(orderLogistics);
+ }
}
-
//添加消息
systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功取消包裹订单，谢谢使用！" : language == 2 ? "You've cancelled the delivery order successfully, thank you for using I-GO "
: "Vous avez annulé la commande de livraison avec succès, merci d’utiliser I-GO", orderLogistics.getUserId(), 1);
@@ -3255,7 +3458,7 @@
public synchronized String getOrderNum() throws Exception{
int size = this.selectCount(null);
- return "LOGISTICS" + String.valueOf(1000000 + size + 1).substring(1);
+ return "DELIVERY" + String.valueOf(1000000 + size + 1).substring(1);
}
@@ -3297,7 +3500,7 @@
BaseWarpper baseWarpper = new BaseWarpper();
double amount = 0;
CancleOrder query = cancleOrderService.query(orderLogistics.getCompanyId());
- if(null == query || null == orderLogistics.getDriverId()){
+ if(null == query || null == orderLogistics.getDriverId() || orderLogistics.getState() == 11){
baseWarpper.setAmount(amount);
return ResultUtil.success(baseWarpper);
}
--
Gitblit v1.7.1