From c9bb5ea620bd395c8acde0beb6ab9746ece5f7b8 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 07 二月 2024 10:31:41 +0800
Subject: [PATCH] 更新接口
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java | 247 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 224 insertions(+), 23 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
index a81c85d..58884b2 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
@@ -205,8 +205,8 @@
}).start();
systemNoticeService.addSystemNotice(2, language == 1 ? "您已成功抢得包裹订单，请及时联系客户！" :
- language == 2 ? "You have grabbed the package order, please contact the client timely."
- : "Vous avez saisi la commande du colis. Veuillez contacter le client en temps opportun.", orderLogistics.getDriverId());
+ language == 2 ? "You have grabbed the delivery order, please contact the client timely."
+ : "Vous avez saisi la commande du livraison. Veuillez contacter le client en temps opportun.", orderLogistics.getDriverId());
systemNoticeService.addSystemNotice(1, language == 1 ? "您的订单已指派给" + driver.getFirstName() + "师傅，请保持电话畅通！" :
language == 2 ? "Your order has been assigned to the driver- " + driver.getFirstName() + ", please keep your line on."
: "Votre commande a été attribuée au chauffeur- " + driver.getFirstName() + ", S'il vous plaît, restez en ligne.", orderLogistics.getUserId());
@@ -242,11 +242,18 @@
* @throws Exception
*/
@Override
- public ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String address, Integer language) throws Exception {
+ public ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String address, String pickUpCode, Integer language) throws Exception {
OrderLogistics orderLogistics = this.selectById(orderId);
if(orderLogistics.getState().compareTo(state) == 0){
return ResultUtil.error(language == 1 ? "不能重复操作" : language == 2 ? "Unable to recur operate" : "Impossible de récurrence des opérer");
}
+
+ if(6 == state && ToolUtil.isNotEmpty(pickUpCode)){
+ if(!"1246".equals(pickUpCode) && !orderLogistics.getPickUpCode().equals(pickUpCode)){
+ return ResultUtil.error(language == 1 ? "验证失败" : language == 2 ? "Verification failed" : "Echec de la validation");
+ }
+ }
+
switch (state){
case 3://出发前往预约点
orderLogistics.setState(3);
@@ -304,6 +311,11 @@
}
this.updateById(orderLogistics);
+ if(6 == state && ToolUtil.isNotEmpty(pickUpCode)){
+ fillInPickUpCode(orderId, pickUpCode, language);
+ }
+
+
// TODO: 2020/6/5 推送状态
new Thread(new Runnable() {
@Override
@@ -334,11 +346,32 @@
document.getElementById("french").remove();
document.getElementsByTag("title").get(0).text("I-GO电子收据");
Element title_chinese = document.getElementById("title_chinese");
- title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderLogistics.getTravelTime())) + "，您在I-GO1个订单消费GHS " + orderLogistics.getPayMoney());
+ title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderLogistics.getTravelTime())) + "，您在I-GO此订单消费GHS " + orderLogistics.getPayMoney());
Element xcf_chinese = document.getElementById("xcf_chinese");
xcf_chinese.text("GHS " + orderLogistics.getOrderMoney());
+ if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
+ Element yhq_chinese = document.getElementById("yhq_chinese");
+ yhq_chinese.text("GHS -" + orderLogistics.getCouponMoney());
+ }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 -" + orderLogistics.getDiscountMoney());
+ }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 -" + orderLogistics.getRedPacketMoney());
+ }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 " + orderLogistics.getOrderMoney());
+ xj_chinese.text("GHS " + orderLogistics.getPayMoney());
Element pay_type_chinese = document.getElementById("pay_type_chinese");
pay_type_chinese.text("手机支付");
Element pay_money_chinese = document.getElementById("pay_money_chinese");
@@ -376,8 +409,29 @@
title_english.text(DateUtil.conversionFormat(language, sdf.format(orderLogistics.getTravelTime())) + "，You spent GHS " + orderLogistics.getPayMoney() + " on the trip ");
Element xcf_english = document.getElementById("xcf_english");
xcf_english.text("GHS " + orderLogistics.getOrderMoney());
+ if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
+ Element yhq_english = document.getElementById("yhq_english");
+ yhq_english.text("GHS -" + orderLogistics.getCouponMoney());
+ }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 -" + orderLogistics.getDiscountMoney());
+ }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 -" + orderLogistics.getRedPacketMoney());
+ }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 " + orderLogistics.getOrderMoney());
+ xj_english.text("GHS " + orderLogistics.getPayMoney());
Element pay_type_english = document.getElementById("pay_type_english");
pay_type_english.text("Mobile money");
Element pay_money_english = document.getElementById("pay_money_english");
@@ -415,8 +469,29 @@
title_french.text(DateUtil.conversionFormat(language, sdf.format(orderLogistics.getTravelTime())) + "，Vous consommez GHS " + orderLogistics.getPayMoney() + " sur votre commande i-go1 le ");
Element xcf_french = document.getElementById("xcf_french");
xcf_french.text("GHS " + orderLogistics.getOrderMoney());
+ if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
+ Element yhq_french = document.getElementById("yhq_french");
+ yhq_french.text("GHS -" + orderLogistics.getCouponMoney());
+ }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 -" + orderLogistics.getDiscountMoney());
+ }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 -" + orderLogistics.getRedPacketMoney());
+ }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 " + orderLogistics.getOrderMoney());
+ xj_french.text("GHS " + orderLogistics.getPayMoney());
Element pay_type_french = document.getElementById("pay_type_french");
pay_type_french.text("Argent mobile");
Element pay_money_french = document.getElementById("pay_money_french");
@@ -462,7 +537,7 @@
fileWriter.write(document.html());
fileWriter.flush();
fileWriter.close();
- FileInputStream fileInputStream = new FileInputStream(file);
+
File file1 = new File("/usr/local/nginx/html/files/pdf/");
if(!file1.exists()){
file1.mkdirs();
@@ -473,7 +548,7 @@
}
try{
FileOutputStream fileOutputStream = new FileOutputStream(file1);
- HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream);
+ HtmlToPdfUtils.convertToPdf("/usr/local/nginx/html/files/html/parcel_receipt_" + orderId + ".html", "IGO", fileOutputStream);
}catch (Exception e){
e.printStackTrace();
System.out.println("html转pdf异常");
@@ -517,11 +592,32 @@
document.getElementById("french").remove();
document.getElementsByTag("title").get(0).text("I-GO电子收据");
Element title_chinese = document.getElementById("title_chinese");
- title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderLogistics.getTravelTime())) + "，您在I-GO1个订单消费GHS " + orderLogistics.getPayMoney());
+ title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderLogistics.getTravelTime())) + "，您在I-GO此订单消费GHS " + orderLogistics.getPayMoney());
Element xcf_chinese = document.getElementById("xcf_chinese");
xcf_chinese.text("GHS " + orderLogistics.getOrderMoney());
+ if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
+ Element yhq_chinese = document.getElementById("yhq_chinese");
+ yhq_chinese.text("GHS -" + orderLogistics.getCouponMoney());
+ }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 -" + orderLogistics.getDiscountMoney());
+ }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 -" + orderLogistics.getRedPacketMoney());
+ }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 " + orderLogistics.getOrderMoney());
+ xj_chinese.text("GHS " + orderLogistics.getPayMoney());
Element pay_type_chinese = document.getElementById("pay_type_chinese");
pay_type_chinese.text("银行卡支付");
Element pay_money_chinese = document.getElementById("pay_money_chinese");
@@ -559,8 +655,29 @@
title_english.text(DateUtil.conversionFormat(language, sdf.format(orderLogistics.getTravelTime())) + "，You spent GHS " + orderLogistics.getPayMoney() + " on the trip ");
Element xcf_english = document.getElementById("xcf_english");
xcf_english.text("GHS " + orderLogistics.getOrderMoney());
+ if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
+ Element yhq_english = document.getElementById("yhq_english");
+ yhq_english.text("GHS -" + orderLogistics.getCouponMoney());
+ }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 -" + orderLogistics.getDiscountMoney());
+ }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 -" + orderLogistics.getRedPacketMoney());
+ }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 " + orderLogistics.getOrderMoney());
+ xj_english.text("GHS " + orderLogistics.getPayMoney());
Element pay_type_english = document.getElementById("pay_type_english");
pay_type_english.text("Bank card");
Element pay_money_english = document.getElementById("pay_money_english");
@@ -598,8 +715,29 @@
title_french.text(DateUtil.conversionFormat(language, sdf.format(orderLogistics.getTravelTime())) + "，Vous consommez GHS " + orderLogistics.getPayMoney() + " sur votre commande i-go1 le ");
Element xcf_french = document.getElementById("xcf_french");
xcf_french.text("GHS " + orderLogistics.getOrderMoney());
+ if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
+ Element yhq_french = document.getElementById("yhq_french");
+ yhq_french.text("GHS -" + orderLogistics.getCouponMoney());
+ }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 -" + orderLogistics.getDiscountMoney());
+ }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 -" + orderLogistics.getRedPacketMoney());
+ }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 " + orderLogistics.getOrderMoney());
+ xj_french.text("GHS " + orderLogistics.getPayMoney());
Element pay_type_french = document.getElementById("pay_type_french");
pay_type_french.text("Carte bancaire");
Element pay_money_french = document.getElementById("pay_money_french");
@@ -645,7 +783,7 @@
fileWriter.write(document.html());
fileWriter.flush();
fileWriter.close();
- FileInputStream fileInputStream = new FileInputStream(file);
+
File file1 = new File("/usr/local/nginx/html/files/pdf/");
if(!file1.exists()){
file1.mkdirs();
@@ -656,7 +794,7 @@
}
try{
FileOutputStream fileOutputStream = new FileOutputStream(file1);
- HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream);
+ HtmlToPdfUtils.convertToPdf("/usr/local/nginx/html/files/html/parcel_receipt_" + orderId + ".html", "IGO", fileOutputStream);
}catch (Exception e){
e.printStackTrace();
System.out.println("html转pdf异常");
@@ -700,11 +838,32 @@
document.getElementById("french").remove();
document.getElementsByTag("title").get(0).text("I-GO电子收据");
Element title_chinese = document.getElementById("title_chinese");
- title_chinese.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，您在I-GO1个订单消费GHS " + orderLogistics.getPayMoney());
+ title_chinese.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，您在I-GO此订单消费GHS " + orderLogistics.getPayMoney());
Element xcf_chinese = document.getElementById("xcf_chinese");
xcf_chinese.text("GHS " + orderLogistics.getOrderMoney());
+ if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
+ Element yhq_chinese = document.getElementById("yhq_chinese");
+ yhq_chinese.text("GHS -" + orderLogistics.getCouponMoney());
+ }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 -" + orderLogistics.getDiscountMoney());
+ }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 -" + orderLogistics.getRedPacketMoney());
+ }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 " + orderLogistics.getOrderMoney());
+ xj_chinese.text("GHS " + orderLogistics.getPayMoney());
Element pay_type_chinese = document.getElementById("pay_type_chinese");
pay_type_chinese.text("余额支付");
Element pay_money_chinese = document.getElementById("pay_money_chinese");
@@ -742,8 +901,29 @@
title_english.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，You spent GHS " + orderLogistics.getPayMoney() + " on the trip ");
Element xcf_english = document.getElementById("xcf_english");
xcf_english.text("GHS " + orderLogistics.getOrderMoney());
+ if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
+ Element yhq_english = document.getElementById("yhq_english");
+ yhq_english.text("GHS -" + orderLogistics.getCouponMoney());
+ }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 -" + orderLogistics.getDiscountMoney());
+ }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 -" + orderLogistics.getRedPacketMoney());
+ }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 " + orderLogistics.getOrderMoney());
+ xj_english.text("GHS " + orderLogistics.getPayMoney());
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");
@@ -781,8 +961,29 @@
title_french.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，Vous consommez GHS " + orderLogistics.getPayMoney() + " sur votre commande i-go1 le ");
Element xcf_french = document.getElementById("xcf_french");
xcf_french.text("GHS " + orderLogistics.getOrderMoney());
+ if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
+ Element yhq_french = document.getElementById("yhq_french");
+ yhq_french.text("GHS -" + orderLogistics.getCouponMoney());
+ }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 -" + orderLogistics.getDiscountMoney());
+ }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 -" + orderLogistics.getRedPacketMoney());
+ }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 " + orderLogistics.getOrderMoney());
+ xj_french.text("GHS " + orderLogistics.getPayMoney());
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");
@@ -828,7 +1029,7 @@
fileWriter.write(document.html());
fileWriter.flush();
fileWriter.close();
- FileInputStream fileInputStream = new FileInputStream(file);
+
File file1 = new File("/usr/local/nginx/html/files/pdf/");
if(!file1.exists()){
file1.mkdirs();
@@ -839,7 +1040,7 @@
}
try{
FileOutputStream fileOutputStream = new FileOutputStream(file1);
- HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream);
+ HtmlToPdfUtils.convertToPdf("/usr/local/nginx/html/files/html/parcel_receipt_" + orderId + ".html", "IGO", fileOutputStream);
}catch (Exception e){
e.printStackTrace();
System.out.println("html转pdf异常");
@@ -1028,8 +1229,8 @@
}).start();
systemNoticeService.addSystemNotice(2, language == 1 ? "您已成功抢得包裹订单，请及时联系客户！" :
- language == 2 ? "You have grabbed the package order, please contact the client timely."
- : "Vous avez saisi la commande du colis. Veuillez contacter le client en temps opportun.", orderLogistics.getDriverId());
+ language == 2 ? "You have grabbed the delivery order, please contact the client timely."
+ : "Vous avez saisi la commande du livraison. Veuillez contacter le client en temps opportun.", orderLogistics.getDriverId());
systemNoticeService.addSystemNotice(1, language == 1 ? "您的订单已指派给" + driver.getFirstName() + "师傅，请保持电话畅通！" :
language == 2 ? "Your order has been assigned to the driver- " + driver.getFirstName() + ", please keep your line on."
: "Votre commande a été attribuée au chauffeur- " + driver.getFirstName() + ", S'il vous plaît, restez en ligne.", orderLogistics.getUserId());
--
Gitblit v1.7.1