From 6982ea4c0a5550b3c88670df87539a91287b115d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 03 八月 2023 11:28:43 +0800
Subject: [PATCH] 修改bug
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java | 115 +++++++++++++++++++++++++++++++++------------------------
1 files changed, 67 insertions(+), 48 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 dd8fbc8..0d151c6 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
@@ -10,14 +10,8 @@
import com.stylefeng.guns.modular.smallLogistics.server.IOrderLogisticsSpreadService;
import com.stylefeng.guns.modular.system.dao.RegionMapper;
import com.stylefeng.guns.modular.system.dao.UserInfoMapper;
-import com.stylefeng.guns.modular.system.model.Company;
-import com.stylefeng.guns.modular.system.model.Driver;
-import com.stylefeng.guns.modular.system.model.Region;
-import com.stylefeng.guns.modular.system.model.UserInfo;
-import com.stylefeng.guns.modular.system.service.ICompanyService;
-import com.stylefeng.guns.modular.system.service.IDriverService;
-import com.stylefeng.guns.modular.system.service.IIncomeService;
-import com.stylefeng.guns.modular.system.service.ISystemNoticeService;
+import com.stylefeng.guns.modular.system.model.*;
+import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.*;
import com.stylefeng.guns.modular.taxi.model.OrderTaxi;
import org.jsoup.Jsoup;
@@ -83,6 +77,12 @@
@Value("${spring.mail.template-path}")
private String templatePath;
+ @Autowired
+ private IPaymentRecordService paymentRecordService;
+
+ @Autowired
+ private ITransactionDetailsService transactionDetailsService;
+
@@ -95,8 +95,8 @@
* @throws Exception
*/
@Override
- public Map<String, Object> queryPushOrder(Integer orderId) throws Exception {
- return orderLogisticsMapper.queryPushOrder(orderId);
+ public Map<String, Object> queryPushOrder(Integer orderId, Integer language) throws Exception {
+ return orderLogisticsMapper.queryPushOrder(orderId, language);
}
@@ -179,7 +179,7 @@
}
}).start();
- systemNoticeService.addSystemNotice(2, "您已成功抢得小件物流订单，请及时联系客户！", orderLogistics.getDriverId());
+ systemNoticeService.addSystemNotice(2, "您已成功抢得包裹订单，请及时联系客户！", orderLogistics.getDriverId());
systemNoticeService.addSystemNotice(1, "您的订单已指派给" + driver.getLastName().substring(0, 1) + "师傅，请保持电话畅通！", orderLogistics.getUserId());
return ResultUtil.success();
@@ -310,8 +310,8 @@
}
@Override
- public List<Map<String, Object>> queryOrderList(Integer driverId) throws Exception {
- return orderLogisticsMapper.queryOrderList(driverId);
+ public List<Map<String, Object>> queryOrderList(Integer driverId, Integer language) throws Exception {
+ return orderLogisticsMapper.queryOrderList(driverId, language);
}
/**
@@ -322,8 +322,8 @@
* @throws Exception
*/
@Override
- public List<Map<String, Object>> queryMyAllOrder(Integer state, Integer uid) throws Exception {
- return orderLogisticsMapper.queryMyAllOrder(state, uid);
+ public List<Map<String, Object>> queryMyAllOrder(Integer state, Integer uid, Integer language) throws Exception {
+ return orderLogisticsMapper.queryMyAllOrder(state, uid, language);
}
@@ -423,17 +423,17 @@
String path = templatePath + "index.html";
Document document = Jsoup.parse(new File(path), "UTF-8");
if(1 == language){
- document.getElementById("english").attr("style", "display: none;");
- document.getElementById("french").attr("style", "display: none;");
- document.getElementById("invite").attr("style", "display: none;");
- document.getElementById("user").attr("style", "display: none;");
- document.getElementById("settle").attr("style", "display: none;");
- document.getElementById("pass").attr("style", "display: none;");
- document.getElementById("bill").attr("style", "display: none;");
- document.getElementById("reward").attr("style", "display: none;");
- document.getElementById("rewardToday").attr("style", "display: none;");
- document.getElementById("driverAudit").attr("style", "display: none;");
- document.getElementById("carAudit").attr("style", "display: none;");
+ document.getElementById("english").remove();
+ document.getElementById("french").remove();
+ document.getElementById("invite").remove();
+ document.getElementById("user").remove();
+ document.getElementById("settle").remove();
+ document.getElementById("pass").remove();
+ document.getElementById("bill").remove();
+ document.getElementById("reward").remove();
+ document.getElementById("rewardToday").remove();
+ document.getElementById("driverAudit").remove();
+ document.getElementById("carAudit").remove();
Element email_user = document.getElementById("email_user");
email_user.text("您好 ，");
@@ -441,17 +441,17 @@
email_content.text("邮件取件码是：" + random + "，请在5分钟内完成验证");
}
if(2 == language){
- document.getElementById("chinese").attr("style", "display: none;");
- document.getElementById("french").attr("style", "display: none;");
- document.getElementById("invite1").attr("style", "display: none;");
- document.getElementById("user1").attr("style", "display: none;");
- document.getElementById("settle1").attr("style", "display: none;");
- document.getElementById("pass1").attr("style", "display: none;");
- document.getElementById("bill1").attr("style", "display: none;");
- document.getElementById("reward1").attr("style", "display: none;");
- document.getElementById("rewardToday1").attr("style", "display: none;");
- document.getElementById("driverAudit1").attr("style", "display: none;");
- document.getElementById("carAudit1").attr("style", "display: none;");
+ document.getElementById("chinese").remove();
+ document.getElementById("french").remove();
+ document.getElementById("invite1").remove();
+ document.getElementById("user1").remove();
+ document.getElementById("settle1").remove();
+ document.getElementById("pass1").remove();
+ document.getElementById("bill1").remove();
+ document.getElementById("reward1").remove();
+ document.getElementById("rewardToday1").remove();
+ document.getElementById("driverAudit1").remove();
+ document.getElementById("carAudit1").remove();
Element email1_user = document.getElementById("email1_user");
email1_user.text("Hello ，");
@@ -459,17 +459,17 @@
email1_content.text("pickup code is " + random + ", please complete the verification within 5 minutes. If the request wasn't made by you, please ignore this email.");
}
if(3 == language){
- document.getElementById("chinese").attr("style", "display: none;");
- document.getElementById("english").attr("style", "display: none;");
- document.getElementById("invite2").attr("style", "display: none;");
- document.getElementById("user2").attr("style", "display: none;");
- document.getElementById("settle2").attr("style", "display: none;");
- document.getElementById("pass2").attr("style", "display: none;");
- document.getElementById("bill2").attr("style", "display: none;");
- document.getElementById("reward2").attr("style", "display: none;");
- document.getElementById("rewardToday2").attr("style", "display: none;");
- document.getElementById("driverAudit2").attr("style", "display: none;");
- document.getElementById("carAudit2").attr("style", "display: none;");
+ document.getElementById("chinese").remove();
+ document.getElementById("english").remove();
+ document.getElementById("invite2").remove();
+ document.getElementById("user2").remove();
+ document.getElementById("settle2").remove();
+ document.getElementById("pass2").remove();
+ document.getElementById("bill2").remove();
+ document.getElementById("reward2").remove();
+ document.getElementById("rewardToday2").remove();
+ document.getElementById("driverAudit2").remove();
+ document.getElementById("carAudit2").remove();
Element email2_user = document.getElementById("email2_user");
email2_user.text("Bonjour ，");
@@ -480,4 +480,23 @@
}
}
+
+
+ @Override
+ public void payOrderLogisticsCallback(Integer id, String order_id, Integer language) throws Exception {
+ OrderLogistics orderLogistics = this.selectById(id);
+ PaymentRecord query = paymentRecordService.query(1, null, 2, Integer.valueOf(id), orderLogistics.getType(), null, 1);
+ if(null != query){
+ //添加交易明细
+ transactionDetailsService.saveData(orderLogistics.getDriverId(), language == 1 ? "现金收款代付" : language == 2 ? "Cash collection on behalf of payment" : "Paiement en espèces", query.getAmount(), 2, 1, 2, orderLogistics.getType(), id);
+ orderLogistics.setDriverPay(2);
+ this.updateById(orderLogistics);
+
+ query.setState(2);
+ query.setCode(order_id);
+ paymentRecordService.updateById(query);
+ }else{
+ System.err.println("预支付数据异常（orderId = " + id + ")");
+ }
+ }
}
--
Gitblit v1.7.1