From aa72a1d1d8c792b322281f5ab01996bc62820b13 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 16 九月 2025 15:31:07 +0800
Subject: [PATCH] 修改bug及数据加密传输

---
 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java
index 809878a..d0c9c5f 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java
@@ -107,7 +107,7 @@
 		try {
 			List<OrderPrivateCar> orderPrivateCars = orderPrivateCarService.selectList(new EntityWrapper<OrderPrivateCar>().eq("isDelete", 1)
 					.eq("state", 7).eq("abnormal", 1)
-					.last(" and now() > DATE_ADD(endServiceTime, INTERVAL 1 HOUR)"));
+					.last(" and now() > DATE_ADD(endServiceTime, INTERVAL 24 HOUR)"));
 			for (OrderPrivateCar orderPrivateCar : orderPrivateCars) {
 				UserInfo userInfo = userInfoService.selectById(orderPrivateCar.getUserId());
 				SendSmsRequest request = new SendSmsRequest();
@@ -120,7 +120,7 @@
 			}
 			List<OrderTaxi> orderTaxis = orderTaxiService.selectList(new EntityWrapper<OrderTaxi>().eq("isDelete", 1)
 					.eq("state", 7).eq("abnormal", 1)
-					.last(" and now() > DATE_ADD(endServiceTime, INTERVAL 1 HOUR)"));
+					.last(" and now() > DATE_ADD(endServiceTime, INTERVAL 24 HOUR)"));
 			for (OrderTaxi orderTaxi : orderTaxis) {
 				UserInfo userInfo = userInfoService.selectById(orderTaxi.getUserId());
 				SendSmsRequest request = new SendSmsRequest();
@@ -142,9 +142,9 @@
 	 */
 	public void timoutNoPayment() {
 		List<OrderPrivateCar> orderPrivateCars = orderPrivateCarService.selectList(new EntityWrapper<OrderPrivateCar>().eq("state", 7)
-				.eq("isDelete", 1).eq("recoveryOrder", 0).eq("abnormal", 1).last(" and now() >= DATE_ADD(getoffTime, INTERVAL 10 MINUTE)"));
+				.eq("isDelete", 1).eq("recoveryOrder", 0).eq("abnormal", 1).last(" and now() >= DATE_ADD(getoffTime, INTERVAL 72 HOUR)"));
 		List<OrderPrivateCar> orderPrivateCars1 = orderPrivateCarService.selectList(new EntityWrapper<OrderPrivateCar>().eq("state", 7)
-				.eq("isDelete", 1).eq("recoveryOrder", 0).eq("abnormal", 2).last(" and now() >= DATE_ADD(abnormalTime, INTERVAL 10 MINUTE)"));
+				.eq("isDelete", 1).eq("recoveryOrder", 0).eq("abnormal", 2).last(" and now() >= DATE_ADD(abnormalTime, INTERVAL 72 HOUR)"));
 		orderPrivateCars.addAll(orderPrivateCars1);
 		for (OrderPrivateCar orderPrivateCar : orderPrivateCars) {
 			try {
@@ -227,6 +227,19 @@
 					orderPrivateCar1.setIsGenerateRecoveryOrder(0);
 					orderPrivateCar1.setOldOrderId(orderPrivateCar.getId());
 					orderPrivateCar1.setRecoveryOrderCreateDate(new Date());
+					orderPrivateCar1.setAbnormal(1);
+					orderPrivateCar1.setResponsibilityType(null);
+					orderPrivateCar1.setResponsibilityMoney(null);
+					orderPrivateCar1.setAbnormalRemark(null);
+					orderPrivateCar1.setAbnormalIntro(null);
+					orderPrivateCar1.setPromotionMoney(null);
+					orderPrivateCar1.setPromotionDriverId(null);
+					orderPrivateCar1.setPromotionActivityId(null);
+					orderPrivateCar1.setSuccessTime(null);
+					orderPrivateCar1.setPromotion(1);
+					orderPrivateCar1.setPromotionPhone(null);
+					orderPrivateCar1.setPromotionUser(null);
+
 					
 					//修改原始订单为支付状态
 					orderPrivateCar.setState(9);

--
Gitblit v1.7.1