From d2de40b544b5b069cd525143ff5a9e0d922b2c66 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 08 八月 2025 15:18:41 +0800
Subject: [PATCH] 我的订单顺风车
---
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 b255273..bdb40ce 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
@@ -84,7 +84,7 @@
//修改过期的商家优惠券
userMerchantCouponService.updateExpired();
//处理超时未支付的订单
- timoutNoPayment();
+// timoutNoPayment();
} catch (Exception e) {
e.printStackTrace();
}
@@ -142,7 +142,7 @@
*/
public void timoutNoPayment() {
List<OrderPrivateCar> orderPrivateCars = orderPrivateCarService.selectList(new EntityWrapper<OrderPrivateCar>().eq("state", 7)
- .eq("isDelete", 1).eq("recoveryOrder", 0).last(" and now() >= DATE_ADD(insertTime, INTERVAL 24 HOUR)"));
+ .eq("isDelete", 1).eq("recoveryOrder", 0).last(" and now() >= DATE_ADD(insertTime, INTERVAL 30 MINUTE)"));
for (OrderPrivateCar orderPrivateCar : orderPrivateCars) {
try {
//使用备付金进行支付订单
@@ -162,6 +162,19 @@
log.error("备付金支付失败：{}", payInfo.getRetMsg());
continue;
}
+ PayInfoData payInfoData = payInfo.getData();
+ PaymentInfo paymentInfo = payInfoData.getPaymentInfos().get(0);
+ //支付成功，通知三方
+ PaymentOrderRequest paymentOrderRequest = new PaymentOrderRequest();
+ paymentOrderRequest.setPayItemId(paymentInfo.getPayItemId());
+ paymentOrderRequest.setPaymentInfo(payInfoData.getPaymentInfos());
+ paymentOrderRequest.setOrderId("PR" + orderPrivateCar.getId());
+ paymentOrderRequest.setCharge(BigDecimal.valueOf(orderPrivateCar.getOrderMoney()));
+ paymentOrderRequest.setPayTime(data.getPayTime());
+ paymentOrderRequest.setPaymentSerialNumber(payInfoData.getPayId());
+ OrderInfo orderInfo1 = OrderUtil.paymentOrder(paymentOrderRequest);
+
+
//查询三方订单状态
Driver driver1 = driverService.selectById(orderPrivateCar.getDriverId());
Company company = companyService.selectById(driver1.getCompanyId());
@@ -172,11 +185,11 @@
request.setDriverId(driver1.getEmpId().toString());
ListPage<List<TravelItinerary>> travelItineraryList = OrderUtil.getTravelItineraryList(request);
Integer status1 = travelItineraryList.getList().get(0).getStatus();
- if(8 != status1){
+ if(9 != status1){
//中台修改订单状态
ModifyTravelItineraryRequest request1 = new ModifyTravelItineraryRequest();
request1.setOrderId(orderPrivateCar.getTravelId());
- request1.setStatus(8);
+ request1.setStatus(9);
if (null != orderPrivateCar.getDriverId()) {
request1.setDriverId(driver1.getEmpId().toString());
request1.setSupplierShopId(company.getEnterCode());
--
Gitblit v1.7.1