From 28391efd42b6233dc0b8182d6d62ad3587694f71 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 06 二月 2024 16:40:33 +0800
Subject: [PATCH] 更新接口
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java | 207 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 198 insertions(+), 9 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 c34bc31..59e4378 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
@@ -349,8 +349,29 @@
title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderLogistics.getTravelTime())) + "，您在I-GO1个订单消费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");
@@ -388,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");
@@ -427,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");
@@ -532,8 +595,29 @@
title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderLogistics.getTravelTime())) + "，您在I-GO1个订单消费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");
@@ -571,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");
@@ -610,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");
@@ -715,8 +841,29 @@
title_chinese.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，您在I-GO1个订单消费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");
@@ -754,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");
@@ -793,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");
--
Gitblit v1.7.1