From cf763f7ae2f86409c5f13b4fe36a25a8ec31cbf8 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期一, 04 九月 2023 09:26:55 +0800
Subject: [PATCH] 用户端 邮件中心
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java | 576 +++++++++++++++++++++++++++++----------------------------
1 files changed, 295 insertions(+), 281 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 deffbbc..0daee41 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
@@ -17,7 +17,12 @@
import com.stylefeng.guns.modular.system.util.*;
import com.stylefeng.guns.modular.system.util.GoogleMap.*;
import com.stylefeng.guns.modular.system.util.Tingg.TinggPayUtil;
+import com.stylefeng.guns.modular.system.util.Tingg.TinggPayoutUtil;
+import com.stylefeng.guns.modular.system.util.Tingg.model.AuthStatus;
import com.stylefeng.guns.modular.system.util.Tingg.model.CheckoutRequest;
+import com.stylefeng.guns.modular.system.util.Tingg.model.PayoutResponse;
+import com.stylefeng.guns.modular.system.util.Tingg.model.Results;
+import com.stylefeng.guns.modular.system.util.itextpdf.HtmlToPdfUtils;
import com.stylefeng.guns.modular.system.warpper.BaseWarpper;
import com.stylefeng.guns.modular.taxi.model.PaymentRecord;
import com.stylefeng.guns.modular.taxi.service.IPaymentRecordService;
@@ -25,12 +30,17 @@
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
+import org.jsoup.nodes.FormElement;
+import org.jsoup.select.Elements;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
import java.math.BigDecimal;
import java.math.MathContext;
import java.math.RoundingMode;
@@ -113,11 +123,18 @@
@Autowired
private IBankCardService bankCardService;
+ @Autowired
+ private TinggPayoutUtil tinggPayoutUtil;
+
@Value("${callbackPath}")
private String callbackPath;
@Value("${spring.mail.template-path}")
private String templatePath;
+
+
+ @Autowired
+ private TEmailService emailService;
private static List<Integer> orderIds = new ArrayList<>();
@@ -287,8 +304,9 @@
this.insert(orderLogistics);
//添加消息
- systemNoticeService.addSystemNotice(1, language == 1 ? "您的市内小件物流订单已下单成功，我们正在为您指派司机，请稍后！" :
- language == 2 ? "Your local small parts logistics order has been successfully placed, we are assigning you a driver, please wait!" : "Votre commande de city small pieces logistics a été passée avec succès. Nous vous assignons un chauffeur. Plus tard!", orderLogistics.getUserId(), 1);
+ systemNoticeService.addSystemNotice(1, language == 1 ? "您的市内包裹订单已下单成功，我们正在为您指派司机，请稍后！" :
+ language == 2 ? "Your parcel order has been successfully placed, we are assigning a driver for you, please wait!"
+ : "Votre commande de colis a bien été passée, nous vous assignons un chauffeur, veuillez patienter!", orderLogistics.getUserId(), 1);
BaseWarpper baseWarpper = new BaseWarpper();
baseWarpper.setId(orderLogistics.getId());
@@ -469,7 +487,7 @@
public ResultUtil payLogisticsOrder(Integer payType, Integer bankCardId, Integer orderId, Integer type, Integer language) throws Exception {
OrderLogistics orderLogistics = this.selectById(orderId);
if(orderLogistics.getState() != 7){
- return ResultUtil.error("订单已完成支付，不允许重复支付");
+ return ResultUtil.error(language == 1 ? "订单已完成支付，不允许重复支付" : language == 2 ? "The order has been paid, no double payment is allowed" : "La commande a été payée, aucun paiement en double n’est autorisé", "");
}
Integer uid = orderLogistics.getUserId();
Double orderMoney = orderLogistics.getOrderMoney();
@@ -477,7 +495,7 @@
orderMoney += null != orderLogistics.getTipMoney() ? orderLogistics.getTipMoney() : 0;
}
UserInfo userInfo = userInfoService.selectById(uid);
- ResultUtil resultUtil = ResultUtil.success();
+ ResultUtil resultUtil = ResultUtil.success("");
if(payType == 1) {//手机支付
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
@@ -493,13 +511,13 @@
checkoutRequest.setRequestDescription("Travel completion payment");
checkoutRequest.setCallbackUrl(callbackPath + "/base/wxPayOrderTaxi");
checkoutRequest.setPendingRedirectUrl("");
- checkoutRequest.setSuccessRedirectUrl("https://10pz685243.zicp.fun");
- checkoutRequest.setFailRedirectUrl("https://www.baidu.com");
+ checkoutRequest.setSuccessRedirectUrl("http://182.160.16.251:81/payMoney/pages/success.html");
+ checkoutRequest.setFailRedirectUrl("http://182.160.16.251:81/payMoney/pages/fail.html");
resultUtil = TinggPayUtil.checkoutRequest(checkoutRequest);
if(resultUtil.getCode()==200){
paymentRecordService.saveData(1, null, null, orderId, 4, 1, orderMoney, null, 1);//添加预支付数据
}else{
- resultUtil = ResultUtil.error("支付失败");
+ resultUtil = ResultUtil.error(language == 1 ? "支付失败" : language == 2 ? "Payment failure" : "Paiement échoué", "");
}
return resultUtil;
}
@@ -519,21 +537,21 @@
checkoutRequest.setRequestDescription("Travel completion payment");
checkoutRequest.setCallbackUrl(callbackPath + "/base/wxPayOrderTaxi");
checkoutRequest.setPendingRedirectUrl("");
- checkoutRequest.setSuccessRedirectUrl("https://10pz685243.zicp.fun");
- checkoutRequest.setFailRedirectUrl("https://www.baidu.com");
+ checkoutRequest.setSuccessRedirectUrl("http://182.160.16.251:81/payMoney/pages/success.html");
+ checkoutRequest.setFailRedirectUrl("http://182.160.16.251:81/payMoney/pages/fail.html");
resultUtil = TinggPayUtil.checkoutRequest(checkoutRequest);
if(resultUtil.getCode()==200){
paymentRecordService.saveData(1, null, null, orderId, 4, 2, orderMoney, null, 1);//添加预支付数据
}else{
- resultUtil = ResultUtil.error("支付失败");
+ resultUtil = ResultUtil.error(language == 1 ? "支付失败" : language == 2 ? "Payment failure" : "Paiement échoué", "");
}
return resultUtil;
}
if(payType == 3){//余额支付
if(userInfo.getBalance() == null || userInfo.getBalance() < orderMoney){
- return ResultUtil.error(language == 1 ? "账户余额不足" : language == 2 ? "Insufficient account balance" : "Solde de compte insuffisant");
+ return ResultUtil.error(language == 1 ? "账户余额不足" : language == 2 ? "Insufficient account balance" : "Solde de compte insuffisant", "");
}
userInfo.setBalance(new BigDecimal(userInfo.getBalance()).subtract(new BigDecimal(orderMoney)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
@@ -542,7 +560,7 @@
userInfo.setIntegral(userInfo.getIntegral() + (orderMoney.intValue() * query1.getIntegral()));//积分
//添加交易明细
- transactionDetailsService.saveData(uid, "小件物流下单支付", orderMoney, 2, 1, 1, 4, orderId);
+ transactionDetailsService.saveData(uid, "包裹下单支付", orderMoney, 2, 1, 1, 4, orderId);
userInfoService.updateById(userInfo);
orderLogistics.setState(1);//小件物流先支付后司机抢单
@@ -550,75 +568,28 @@
orderLogistics.setPayMoney(orderMoney);
-
- 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");
- if(1 == language){
- document.getElementById("english").attr("style", "display: none;");
- document.getElementById("french").attr("style", "display: none;");
- Element title_chinese = document.getElementById("title_chinese");
- title_chinese.text(sdf2.format(orderLogistics.getTravelTime()) + "，您在I-GO1个订单消费GHS " + orderLogistics.getPayMoney());
- Element xcf_chinese = document.getElementById("xcf_chinese");
- xcf_chinese.text("GHS " + orderLogistics.getOrderMoney());
- Element xj_chinese = document.getElementById("xj_chinese");
- xj_chinese.text("GHS " + orderLogistics.getOrderMoney());
- 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 " + orderLogistics.getPayMoney());
- Element pay_time_chinese = document.getElementById("pay_time_chinese");
- pay_time_chinese.text(sdf1.format(orderLogistics.getTravelTime()));
- 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());
- }
- if(2 == language){
- document.getElementById("chinese").attr("style", "display: none;");
- document.getElementById("french").attr("style", "display: none;");
- Element title_english = document.getElementById("title_english");
- title_english.text(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());
- Element xj_english = document.getElementById("xj_english");
- xj_english.text("GHS " + orderLogistics.getOrderMoney());
- Element pay_type_english = document.getElementById("pay_type_english");
- pay_type_english.text("balance");
- Element pay_money_english = document.getElementById("pay_money_english");
- pay_money_english.text("GHS " + orderLogistics.getPayMoney());
- Element pay_time_english = document.getElementById("pay_time_english");
- pay_time_english.text(sdf1.format(orderLogistics.getTravelTime()));
- 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());
- }
- if(3 == language){
- document.getElementById("chinese").attr("style", "display: none;");
- document.getElementById("english").attr("style", "display: none;");
- Element title_french = document.getElementById("title_french");
- title_french.text(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());
- Element xj_french = document.getElementById("xj_french");
- xj_french.text("GHS " + orderLogistics.getOrderMoney());
- Element pay_type_french = document.getElementById("pay_type_french");
- pay_type_french.text("Le solde");
- Element pay_money_french = document.getElementById("pay_money_french");
- pay_money_french.text("GHS " + orderLogistics.getPayMoney());
- Element pay_time_french = document.getElementById("pay_time_french");
- pay_time_french.text(sdf1.format(orderLogistics.getTravelTime()));
- 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());
- }
-
- EmailUtil.send(userInfo.getEmail(), language == 1 ? "市内小件物流收据" : language == 2 ? "Reset password" : "Réinitialiser le mot de passe", document.html());
+ //添加已收入明细
+ Company company = companyService.selectById(orderLogistics.getCompanyId());
+ Double speMoney = company.getCrossLogisticsMoney();
+ BigDecimal d = null;//企业收入
+ BigDecimal c = null;//司机收入
+ if(company.getIsCrossLogisticsFixedOrProportional() == 2){//固定
+ d = new BigDecimal(speMoney);
+ c = new BigDecimal(orderLogistics.getOrderMoney()).subtract(d);//只有出行金额参与抽成，其余归属司机
}
+ if(company.getIsSpeFixedOrProportional() == 1){//比例
+ Double price = orderLogistics.getOrderMoney();
+ 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() {
@@ -627,9 +598,9 @@
pushUtil.pushOrderState(1, orderLogistics.getUserId(), orderLogistics.getId(), orderLogistics.getType(), orderLogistics.getState(), 0);
}
}).start();
- systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功完成小件物流订单支付，谢谢使用！" : language == 2
- ? "You have successfully completed the small parts logistics order payment, thank you for using!" :
- "Vous avez complété avec succès le paiement de la commande small pieces logistics. Merci d’utiliser!", uid, 1);
+ systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功完成包裹订单支付，谢谢使用！" : language == 2
+ ? "You have successfully completed the parcel order payment, thank you for using!" :
+ "Vous avez terminé avec succès le paiement de la commande de colis, merci de l’utiliser!", uid, 1);
this.pushOrder(orderLogistics);//推单
}
@@ -638,7 +609,7 @@
userInfo.setIntegral(userInfo.getIntegral() + (orderMoney.intValue() * query1.getIntegral()));//积分
//添加交易明细
- transactionDetailsService.saveData(uid, "小件物流下单支付", orderMoney, 2, 1, 1, 4, orderId);
+ transactionDetailsService.saveData(uid, "包裹下单支付", orderMoney, 2, 1, 1, 4, orderId);
userInfoService.updateById(userInfo);
orderLogistics.setState(1);//小件物流先支付后司机抢单
@@ -647,72 +618,160 @@
orderLogistics.setPayMoney(orderMoney);
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");
- if(1 == language){
- document.getElementById("english").attr("style", "display: none;");
- document.getElementById("french").attr("style", "display: none;");
- Element title_chinese = document.getElementById("title_chinese");
- title_chinese.text(sdf2.format(orderLogistics.getTravelTime()) + "，您在I-GO1个订单消费GHS " + orderLogistics.getPayMoney());
- Element xcf_chinese = document.getElementById("xcf_chinese");
- xcf_chinese.text("GHS " + orderLogistics.getOrderMoney());
- Element xj_chinese = document.getElementById("xj_chinese");
- xj_chinese.text("GHS " + orderLogistics.getOrderMoney());
- 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 " + orderLogistics.getPayMoney());
- Element pay_time_chinese = document.getElementById("pay_time_chinese");
- pay_time_chinese.text(sdf1.format(orderLogistics.getTravelTime()));
- 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());
- }
- if(2 == language){
- document.getElementById("chinese").attr("style", "display: none;");
- document.getElementById("french").attr("style", "display: none;");
- Element title_english = document.getElementById("title_english");
- title_english.text(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());
- Element xj_english = document.getElementById("xj_english");
- xj_english.text("GHS " + orderLogistics.getOrderMoney());
- 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 " + orderLogistics.getPayMoney());
- Element pay_time_english = document.getElementById("pay_time_english");
- pay_time_english.text(sdf1.format(orderLogistics.getTravelTime()));
- 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());
- }
- if(3 == language){
- document.getElementById("chinese").attr("style", "display: none;");
- document.getElementById("english").attr("style", "display: none;");
- Element title_french = document.getElementById("title_french");
- title_french.text(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());
- Element xj_french = document.getElementById("xj_french");
- xj_french.text("GHS " + orderLogistics.getOrderMoney());
- Element pay_type_french = document.getElementById("pay_type_french");
- pay_type_french.text("espèces");
- Element pay_money_french = document.getElementById("pay_money_french");
- pay_money_french.text("GHS " + orderLogistics.getPayMoney());
- Element pay_time_french = document.getElementById("pay_time_french");
- pay_time_french.text(sdf1.format(orderLogistics.getTravelTime()));
- 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());
- }
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ 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());
+ if(1 == language){
+ document.getElementById("english").remove();
+ document.getElementById("french").remove();
+ Element title_chinese = document.getElementById("title_chinese");
+ title_chinese.text(sdf2.format(orderLogistics.getTravelTime()) + "，您在I-GO1个订单消费GHS " + orderLogistics.getPayMoney());
+ Element xcf_chinese = document.getElementById("xcf_chinese");
+ xcf_chinese.text("GHS " + orderLogistics.getOrderMoney());
+ Element xj_chinese = document.getElementById("xj_chinese");
+ xj_chinese.text("GHS " + orderLogistics.getOrderMoney());
+ 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 " + orderLogistics.getPayMoney());
+ Element pdf_chinese = document.getElementById("pdf_chinese");
+ pdf_chinese.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
+ Element lost_item_chinese = document.getElementById("lost_item_chinese");
+ lost_item_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4");
+// Element track_chinese = document.getElementById("track_chinese");
+// track_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/location.html");
+ Element pay_time_chinese = document.getElementById("pay_time_chinese");
+ pay_time_chinese.text(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 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());
+ }
+ if(2 == language){
+ document.getElementById("chinese").remove();
+ document.getElementById("french").remove();
+ Element title_english = document.getElementById("title_english");
+ title_english.text(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());
+ Element xj_english = document.getElementById("xj_english");
+ xj_english.text("GHS " + orderLogistics.getOrderMoney());
+ 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 " + orderLogistics.getPayMoney());
+ Element pdf_english = document.getElementById("pdf_english");
+ pdf_english.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
+ Element lost_item_english = document.getElementById("lost_item_english");
+ lost_item_english.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4");
+// Element track_english = document.getElementById("track_english");
+// track_english.attr("href", "http://182.160.16.251:81/mailbox/user/location.html");
+ Element pay_time_english = document.getElementById("pay_time_english");
+ pay_time_english.text(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 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());
+ }
+ if(3 == language){
+ document.getElementById("chinese").remove();
+ document.getElementById("english").remove();
+ Element title_french = document.getElementById("title_french");
+ title_french.text(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());
+ Element xj_french = document.getElementById("xj_french");
+ xj_french.text("GHS " + orderLogistics.getOrderMoney());
+ Element pay_type_french = document.getElementById("pay_type_french");
+ pay_type_french.text("espèces");
+ Element pay_money_french = document.getElementById("pay_money_french");
+ pay_money_french.text("GHS " + orderLogistics.getPayMoney());
+ Element pdf_french = document.getElementById("pdf_french");
+ pdf_french.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
+ Element lost_item_french = document.getElementById("lost_item_french");
+ lost_item_french.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4");
+// Element track_french = document.getElementById("track_french");
+// track_french.attr("href", "http://182.160.16.251:81/mailbox/user/location.html");
+ Element pay_time_french = document.getElementById("pay_time_french");
+ pay_time_french.text(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 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());
+ }
- EmailUtil.send(userInfo.getEmail(), language == 1 ? "市内小件物流收据" : language == 2 ? "Reset password" : "Réinitialiser le mot de passe", document.html());
+ EmailUtil.send(userInfo.getEmail(), language == 1 ? "包裹收据" : language == 2 ? "Parcel receipt" : "Réception de colis", document.html());
+
+ //开始生成pdf收据和html收据
+ File file = new File("/usr/local/nginx/html/files/html/");
+ if(!file.exists()){
+ file.mkdirs();
+ }
+ file = new File("/usr/local/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();
+ FileInputStream fileInputStream = new FileInputStream(file);
+ File file1 = new File("/usr/local/nginx/html/files/pdf/");
+ if(!file1.exists()){
+ file1.mkdirs();
+ }
+ file1 = new File("/usr/local/nginx/html/files/pdf/parcel_receipt_" + orderId + ".pdf");
+ if(!file1.exists()){
+ file1.createNewFile();
+ }
+ FileOutputStream fileOutputStream = new FileOutputStream(file1);
+ HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream);
+
+ String link ="http://182.160.16.251:81/files/html/parcel_receipt_" + orderId + ".html";
+ TEmail tEmail = new TEmail();
+ tEmail.setLink(link);
+ tEmail.setUserId(uid);
+ tEmail.setType(1);
+ tEmail.setName(language == 1 ? "包裹收据" : language == 2 ? "Parcel receipt" : "Réception de colis");
+ 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?"AM":"Dans la matinée");
+ }else {
+ tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
+ }
+ emailService.insert(tEmail);
+
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+ }).start();
}
@@ -725,9 +784,9 @@
}
}).start();
- systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功完成小件物流订单支付，谢谢使用！" : language == 2
- ? "You have successfully completed the small parts logistics order payment, thank you for using!" :
- "Vous avez complété avec succès le paiement de la commande small pieces logistics. Merci d’utiliser!", uid, 1);
+ systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功完成包裹订单支付，谢谢使用！" : language == 2
+ ? "You have successfully completed the parcel order payment, thank you for using!" :
+ "Vous avez terminé avec succès le paiement de la commande de colis, merci de l’utiliser!", uid, 1);
this.pushOrder(orderLogistics);//推单
}
@@ -769,8 +828,8 @@
checkoutRequest.setRequestDescription("Travel completion payment");
checkoutRequest.setCallbackUrl(callbackPath + "/base/wxPayOrderLogisticsSpread");
checkoutRequest.setPendingRedirectUrl("");
- checkoutRequest.setSuccessRedirectUrl("https://10pz685243.zicp.fun");
- checkoutRequest.setFailRedirectUrl("https://www.baidu.com");
+ checkoutRequest.setSuccessRedirectUrl("http://182.160.16.251:81/payMoney/pages/success.html");
+ checkoutRequest.setFailRedirectUrl("http://182.160.16.251:81/payMoney/pages/fail.html");
return TinggPayUtil.checkoutRequest(checkoutRequest);
}
if(payType == 2){//银行卡支付
@@ -788,8 +847,8 @@
checkoutRequest.setRequestDescription("Travel completion payment");
checkoutRequest.setCallbackUrl(callbackPath + "/base/wxPayOrderLogisticsSpread");
checkoutRequest.setPendingRedirectUrl("");
- checkoutRequest.setSuccessRedirectUrl("https://10pz685243.zicp.fun");
- checkoutRequest.setFailRedirectUrl("https://www.baidu.com");
+ checkoutRequest.setSuccessRedirectUrl("http://182.160.16.251:81/payMoney/pages/success.html");
+ checkoutRequest.setFailRedirectUrl("http://182.160.16.251:81/payMoney/pages/fail.html");
return TinggPayUtil.checkoutRequest(checkoutRequest);
}
@@ -804,7 +863,7 @@
userInfo.setIntegral(userInfo.getIntegral() + (orderMoney.intValue() * query1.getIntegral()));//积分
//添加交易明细
- transactionDetailsService.saveData(uid, "小件物流补差价", orderMoney, 2, 1, 1, 4, orderId);
+ transactionDetailsService.saveData(uid, "包裹补差价", orderMoney, 2, 1, 1, 4, orderId);
userInfoService.updateById(userInfo);
orderLogistics.setState(12);//已支付差价
@@ -850,9 +909,9 @@
}
}).start();
- systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功完成小件物流订单差价支付，谢谢使用！" : language == 2
- ? "You have successfully completed the price difference payment of small parts logistics order, thank you for using!"
- : "Vous avez complété avec succès le paiement de la différence de prix de la commande de petites pièces logistiques, merci d’utiliser!", uid, 1);
+ systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功完成包裹订单差价支付，谢谢使用！" : language == 2
+ ? "You have successfully completed the difference payment of parcel order, thank you for using!"
+ : "Vous avez complété avec succès le paiement de la différence de commande de colis, merci de l’utiliser!", uid, 1);
}
if(payType == 4){//现金支付
@@ -860,7 +919,7 @@
userInfo.setIntegral(userInfo.getIntegral() + (orderMoney.intValue() * query1.getIntegral()));//积分
//添加交易明细
- transactionDetailsService.saveData(uid, "小件物流补差价", orderMoney, 2, 1, 1, 4, orderId);
+ transactionDetailsService.saveData(uid, "包裹补差价", orderMoney, 2, 1, 1, 4, orderId);
userInfoService.updateById(userInfo);
orderLogistics.setState(12);//已支付差价
@@ -907,9 +966,9 @@
}
}).start();
- systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功完成小件物流订单差价支付，谢谢使用！" : language == 2
- ? "You have successfully completed the price difference payment of small parts logistics order, thank you for using!"
- : "Vous avez complété avec succès le paiement de la différence de prix de la commande de petites pièces logistiques, merci d’utiliser!", uid, 1);
+ systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功完成包裹订单差价支付，谢谢使用！" : language == 2
+ ? "You have successfully completed the difference payment of parcel order, thank you for using!"
+ : "Vous avez complété avec succès le paiement de la différence de commande de colis, merci de l’utiliser!", uid, 1);
}
@@ -940,75 +999,27 @@
query.setCode(order_id);
paymentRecordService.updateById(query);
- if(ToolUtil.isNotEmpty(userInfo.getEmail())){
- String path = templatePath + "user/receiptLogistics.html";
- Document document = Jsoup.parse(new File(path), "UTF-8");
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy年MM月dd日");
- SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy/MM/dd HH:mm");
- if(1 == language){
- document.getElementById("english").attr("style", "display: none;");
- document.getElementById("french").attr("style", "display: none;");
- Element title_chinese = document.getElementById("title_chinese");
- title_chinese.text(sdf.format(orderLogistics.getTravelTime()) + "，您在I-GO1个订单消费GHS " + orderLogistics.getPayMoney());
- Element xcf_chinese = document.getElementById("xcf_chinese");
- xcf_chinese.text("GHS " + orderLogistics.getOrderMoney());
- Element xj_chinese = document.getElementById("xj_chinese");
- xj_chinese.text("GHS " + orderLogistics.getOrderMoney());
- 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 " + orderLogistics.getPayMoney());
- Element pay_time_chinese = document.getElementById("pay_time_chinese");
- pay_time_chinese.text(sdf1.format(orderLogistics.getTravelTime()));
- 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());
- }
- if(2 == language){
- document.getElementById("chinese").attr("style", "display: none;");
- document.getElementById("french").attr("style", "display: none;");
- Element title_english = document.getElementById("title_english");
- title_english.text(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());
- Element xj_english = document.getElementById("xj_english");
- xj_english.text("GHS " + orderLogistics.getOrderMoney());
- Element pay_type_english = document.getElementById("pay_type_english");
- pay_type_english.text("balance");
- Element pay_money_english = document.getElementById("pay_money_english");
- pay_money_english.text("GHS " + orderLogistics.getPayMoney());
- Element pay_time_english = document.getElementById("pay_time_english");
- pay_time_english.text(sdf1.format(orderLogistics.getTravelTime()));
- 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());
- }
- if(3 == language){
- document.getElementById("chinese").attr("style", "display: none;");
- document.getElementById("english").attr("style", "display: none;");
- Element title_french = document.getElementById("title_french");
- title_french.text(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());
- Element xj_french = document.getElementById("xj_french");
- xj_french.text("GHS " + orderLogistics.getOrderMoney());
- Element pay_type_french = document.getElementById("pay_type_french");
- pay_type_french.text("Le solde");
- Element pay_money_french = document.getElementById("pay_money_french");
- pay_money_french.text("GHS " + orderLogistics.getPayMoney());
- Element pay_time_french = document.getElementById("pay_time_french");
- pay_time_french.text(sdf1.format(orderLogistics.getTravelTime()));
- 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());
- }
-
- EmailUtil.send(userInfo.getEmail(), language == 1 ? "市内小件物流收据" : language == 2 ? "Reset password" : "Réinitialiser le mot de passe", document.html());
+ //添加已收入明细
+ Company company = companyService.selectById(orderLogistics.getCompanyId());
+ Double speMoney = company.getCrossLogisticsMoney();
+ BigDecimal d = null;//企业收入
+ BigDecimal c = null;//司机收入
+ if(company.getIsCrossLogisticsFixedOrProportional() == 2){//固定
+ d = new BigDecimal(speMoney);
+ c = new BigDecimal(orderLogistics.getOrderMoney()).subtract(d);//只有出行金额参与抽成，其余归属司机
}
-
+ if(company.getIsSpeFixedOrProportional() == 1){//比例
+ Double price = orderLogistics.getOrderMoney();
+ 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 这里需要给司机和用户推送订单状态
@@ -1020,9 +1031,9 @@
}).start();
- systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功完成小件物流订单支付，谢谢使用！" : language == 2
- ? "You have successfully completed the small parts logistics order payment, thank you for using!" :
- "Vous avez complété avec succès le paiement de la commande small pieces logistics. Merci d’utiliser!", orderLogistics.getUserId(), 1);
+ systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功完成包裹订单支付，谢谢使用！" : language == 2
+ ? "You have successfully completed the parcel order payment, thank you for using!" :
+ "Vous avez terminé avec succès le paiement de la commande de colis, merci de l’utiliser!", orderLogistics.getUserId(), 1);
this.pushOrder(orderLogistics);//推单
}else{
@@ -1054,7 +1065,7 @@
userInfo.setIntegral(userInfo.getIntegral() + (orderMoney.intValue() * query1.getIntegral()));//积分
//添加交易明细
- transactionDetailsService.saveData(orderLogistics.getUserId(), "小件物流补差价", orderMoney, 2, 1, 1, 4, id);
+ transactionDetailsService.saveData(orderLogistics.getUserId(), "包裹补差价", orderMoney, 2, 1, 1, 4, id);
userInfoService.updateById(userInfo);
orderLogistics.setState(12);//已支付差价
@@ -1095,9 +1106,9 @@
}
}).start();
- systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功完成小件物流订单差价支付，谢谢使用！" : language == 2
- ? "You have successfully completed the price difference payment of small parts logistics order, thank you for using!"
- : "Vous avez complété avec succès le paiement de la différence de prix de la commande de petites pièces logistiques, merci d’utiliser!", orderLogistics.getUserId(), 1);
+ systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功完成包裹订单差价支付，谢谢使用！" : language == 2
+ ? "You have successfully completed the difference payment of parcel order, thank you for using!"
+ : "Vous avez complété avec succès le paiement de la différence de commande de colis, merci de l’utiliser!", orderLogistics.getUserId(), 1);
}else{
System.err.println("预支付数据异常（orderId = " + id + ")");
}
@@ -1128,9 +1139,18 @@
* @throws Exception
*/
@Override
- public List<Map<String, Object>> queryMyOrderList(Integer uid, Integer pageNum, Integer size) throws Exception {
+ public List<Map<String, Object>> queryMyOrderList(Integer uid, Integer pageNum, Integer size, Integer language) throws Exception {
pageNum = (pageNum - 1) * size;
- List<Map<String, Object>> maps = orderLogisticsMapper.queryMyOrderList(uid, pageNum, size);
+ List<Map<String, Object>> maps = orderLogisticsMapper.queryMyOrderList(uid, pageNum, size, language);
+ for (Map<String, Object> map : maps) {
+ Integer orderId = Integer.valueOf(String.valueOf(map.get("orderId")));
+ Integer state = Integer.valueOf(String.valueOf(map.get("state")));
+ if(state == 6){
+ map.put("receipt", "http://182.160.16.251:81/files/html/parcel_receipt_" + orderId + ".html");
+ }else{
+ map.put("receipt", "");
+ }
+ }
return maps;
}
@@ -1205,24 +1225,21 @@
orderCancelService.insert(orderCancel);
orderLogistics.setState(10);
this.updateById(orderLogistics);
- integer = orderCancel.getId();
//调用回退接口
PaymentRecord query = paymentRecordService.query(1, orderLogistics.getUserId(), 1, orderLogistics.getId(), orderLogistics.getType(), 1, 2);
- Map<String, String> merrefund = payMoneyUtil.wxRefund(query.getCode(),orderLogistics.getId() + "," + orderLogistics.getType(),query.getAmount()+"",query.getAmount()+"","");
- //Map<String, Object> merrefund = icbcPayUtil.merrefund(query.getCode(), "", query.getAmount(), orderLogistics.getId() + "_" + orderLogistics.getType(), orderLogistics.getOrderNum());
- if ("SUCCESS".equals(merrefund.get("return_code"))) {//成功
- //添加交易明细
- transactionDetailsService.saveData(orderLogistics.getUserId(), "小件物流取消退款", query.getAmount(), 1, 1, 1, 4, orderLogistics.getId());
- }else{
- return ResultUtil.error("退款返回未知异常");
+ UserInfo userInfo = userInfoService.selectById(orderLogistics.getUserId());
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
+ String payerTransactionID = sdf.format(new Date()) + orderCancel.getId();
+ PayoutResponse payoutResponse = tinggPayoutUtil.sendPayout(userInfo.getPhoneOperator(), "+" + userInfo.getPhone(), payerTransactionID, query.getAmount().doubleValue(), callbackPath + "/base/orderCancelRefundCallback", "取消订单退款");
+ AuthStatus authStatus = payoutResponse.getAuthStatus();
+ Results results = payoutResponse.getResults().get(0);
+ String statusCode = results.getStatusCode();
+ if(!"131".equals(authStatus.getAuthStatusCode())){
+ return ResultUtil.error(authStatus.getAuthStatusDescription());
}
- /*if (Integer.valueOf(refundqry.get("code").toString()) == 0 && Integer.valueOf(refundqry.get("pay_status").toString()) == 1) {//失败
- return ResultUtil.error("订单取消失败（退款不成功）");
+ if(!"139".equals(statusCode)){
+ return ResultUtil.error(results.getStatusDescription());
}
- if (Integer.valueOf(refundqry.get("code").toString()) == 0 && Integer.valueOf(refundqry.get("pay_status").toString()) == 2) {//未知
-
-
- }*/
}
if(null != orderLogistics.getPayType() && orderLogistics.getPayType() == 2){//支付宝
OrderCancel orderCancel = new OrderCancel();
@@ -1238,29 +1255,19 @@
this.updateById(orderLogistics);
integer = orderCancel.getId();
//调用回退接口
- PaymentRecord query = paymentRecordService.query(1, orderLogistics.getUserId(), 1, orderLogistics.getId(), orderLogistics.getType(), 2, 2);
- /*Map<String, Object> merrefund = icbcPayUtil.merrefund(query.getCode(), "", query.getAmount(), orderLogistics.getId() + "_" + orderLogistics.getType(), orderLogistics.getOrderNum());
- if (Integer.valueOf(merrefund.get("code").toString()) == 0) {
- Map<String, Object> refundqry = icbcPayUtil.refundqry("", query.getCode(), orderLogistics.getOrderNum());
- if (Integer.valueOf(refundqry.get("code").toString()) == 0 && Integer.valueOf(refundqry.get("pay_status").toString()) == 0) {//成功
- //添加交易明细
- transactionDetailsService.saveData(orderLogistics.getUserId(), "小件物流取消退款", query.getAmount(), 1, 1, 1, 4, orderLogistics.getId());
- }
- if (Integer.valueOf(refundqry.get("code").toString()) == 0 && Integer.valueOf(refundqry.get("pay_status").toString()) == 1) {//失败
- return ResultUtil.error("订单取消失败（退款不成功）");
- }
- if (Integer.valueOf(refundqry.get("code").toString()) == 0 && Integer.valueOf(refundqry.get("pay_status").toString()) == 2) {//未知
- return ResultUtil.error("退款返回未知异常");
-
- }
- }*/
- Map<String, String> merrefund = payMoneyUtil.aliRefund(query.getCode(),query.getAmount()+"");
- //Map<String, Object> merrefund = icbcPayUtil.merrefund(query.getCode(), "", query.getAmount(), orderLogistics.getId() + "_" + orderLogistics.getType(), orderLogistics.getOrderNum());
- if ("SUCCESS".equals(merrefund.get("return_code"))) {//成功
- //添加交易明细
- transactionDetailsService.saveData(orderLogistics.getUserId(), "小件物流取消退款", query.getAmount(), 1, 1, 1, 4, orderLogistics.getId());
- }else{
- return ResultUtil.error("退款返回未知异常");
+ PaymentRecord query = paymentRecordService.query(1, orderLogistics.getUserId(), 1, orderLogistics.getId(), orderLogistics.getType(), 1, 2);
+ UserInfo userInfo = userInfoService.selectById(orderLogistics.getUserId());
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
+ String payerTransactionID = sdf.format(new Date()) + orderCancel.getId();
+ PayoutResponse payoutResponse = tinggPayoutUtil.sendPayout(userInfo.getPhoneOperator(), "+" + userInfo.getPhone(), payerTransactionID, query.getAmount().doubleValue(), callbackPath + "/base/orderCancelRefundCallback", "取消订单退款");
+ AuthStatus authStatus = payoutResponse.getAuthStatus();
+ Results results = payoutResponse.getResults().get(0);
+ String statusCode = results.getStatusCode();
+ if(!"131".equals(authStatus.getAuthStatusCode())){
+ return ResultUtil.error(authStatus.getAuthStatusDescription());
+ }
+ if(!"139".equals(statusCode)){
+ return ResultUtil.error(results.getStatusDescription());
}
}
if(null != orderLogistics.getPayType() && orderLogistics.getPayType() == 3){//余额
@@ -1282,7 +1289,7 @@
integer = orderCancel.getId();
//添加交易明细
- transactionDetailsService.saveData(orderLogistics.getUserId(), "小件物流取消退款", orderLogistics.getPayMoney(), 1, 1, 1, 4, orderLogistics.getId());
+ transactionDetailsService.saveData(orderLogistics.getUserId(), "包裹取消退款", orderLogistics.getPayMoney(), 1, 1, 1, 4, orderLogistics.getId());
}
if(null != orderLogistics.getDriverId()){
@@ -1295,7 +1302,8 @@
}
//添加消息
- systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功取消小件物流订单，谢谢使用！" : language == 2 ? "You have successfully cancelled the small logistics order, thank you for using" : "Vous avez annulé avec succès la petite commande logistique, merci d'utiliser", orderLogistics.getUserId(), 1);
+ systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功取消包裹订单，谢谢使用！" : language == 2 ? "You have successfully cancelled your parcel order, thank you for using!"
+ : "Vous avez annulé avec succès votre commande de colis, merci de l’utiliser!", orderLogistics.getUserId(), 1);
Map<String, Object> map = new HashMap<>();
map.put("id", integer);
return ResultUtil.success(map);
@@ -1357,12 +1365,13 @@
@Override
public Map<String, Object> queryOrderInfo(Integer orderId) throws Exception {
Map<String, Object> map = orderLogisticsMapper.queryOrderInfo(orderId);
+ Integer state = Integer.valueOf(String.valueOf(map.get("state")));
OrderLogistics orderLogistics = this.selectById(orderId);
if(null != map.get("reassignNotice") && Integer.valueOf(String.valueOf(map.get("reassignNotice"))) == 2){//改派完成，重新获取了新的司机数据，开始修改数据防止继续调用
orderLogistics.setReassignNotice(0);
this.updateById(orderLogistics);
}
- if(Integer.valueOf(String.valueOf(map.get("state"))) == 11){
+ if(state == 11){
map.put("state", map.get("oldState"));
}
Map<String, String> geocode = gdMapGeocodingUtil.geocode(map.get("startLon").toString(), map.get("startLat").toString());
@@ -1373,6 +1382,11 @@
String driverId = redisUtil.getValue("DEVICE_" + map.get("driverId"));
map.put("device", ToolUtil.isNotEmpty(driverId) ? 2 : 1);
map.put("orderType", orderLogistics.getType());
+ if(state == 6){
+ map.put("receipt", "http://182.160.16.251:81/files/html/parcel_receipt_" + orderId + ".html");
+ }else{
+ map.put("receipt", "");
+ }
return map;
}
--
Gitblit v1.7.1