From 7c49bd92fd7e25743928e7e6cf305cdd2f877527 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 14 十一月 2025 10:46:42 +0800
Subject: [PATCH] 修改bug

---
 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 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 b591005..d84ae91 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
@@ -98,8 +98,8 @@
 				e.printStackTrace();
 			}
 		}
-
 	}
+
 	
 
 	
@@ -149,9 +149,11 @@
 	 */
 	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 72 HOUR)"));
+				.eq("isDelete", 1).eq("recoveryOrder", 0).eq("abnormal", 1).lt("bfPayNumber", 5)
+				.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 72 HOUR)"));
+				.eq("isDelete", 1).eq("recoveryOrder", 0).eq("abnormal", 2).lt("bfPayNumber", 5)
+				.last(" and now() >= DATE_ADD(abnormalTime, INTERVAL 72 HOUR)"));
 		orderPrivateCars.addAll(orderPrivateCars1);
 		for (OrderPrivateCar orderPrivateCar : orderPrivateCars) {
 			try {
@@ -181,14 +183,19 @@
 				tradePayOffData.setOrderDesc("完成订单");
 				PayInfo payInfo = OrderUtil.tradePayOff(tradePayOffData);
 				String retCode = payInfo.getRetCode();
+				orderPrivateCar.setBfPayNumber(orderPrivateCar.getBfPayNumber() + 1);
 				if (!"000000".equals(retCode)) {
 					log.error("备付金支付失败:{}", payInfo.getRetMsg());
+					orderPrivateCar.setBfPayFailure(payInfo.getRetMsg());
+					orderPrivateCarService.updateById(orderPrivateCar);
 					return;
 				}
 				PayInfoData data = payInfo.getData();
 				String status = data.getStatus();
 				if ("3".equals(status)) {
 					log.error("备付金支付失败:{}", payInfo.getRetMsg());
+					orderPrivateCar.setBfPayFailure(payInfo.getRetMsg());
+					orderPrivateCarService.updateById(orderPrivateCar);
 					return;
 				}
 				if("0".equals(status)){

--
Gitblit v1.7.1