From 2eff47cee650f624b4fb61fb6f073e1e521b8082 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期四, 22 一月 2026 20:06:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
index 464698f..f084e19 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
@@ -834,6 +834,7 @@
 			orderCrossCity.setState(2);//跨城支付完成后才开始服务
 			orderCrossCity.setPayType(3);
 			orderCrossCity.setPayMoney(orderMoney);
+            orderCrossCity.setPayTime(new Date());
 			
 			//处理优惠券和红包
 			if (null != userCouponRecord) {
@@ -1191,6 +1192,7 @@
 			orderCrossCity.setState(2);//跨城支付完成后才开始服务
 			orderCrossCity.setPayType(3);
 			orderCrossCity.setPayMoney(orderMoney);
+            orderCrossCity.setPayTime(new Date());
 			
 			//处理优惠券和红包
 			if (null != userCouponRecord) {
@@ -1259,6 +1261,7 @@
 			orderCrossCity.setPayType(type);
 			orderCrossCity.setPayMoney(query.getAmount());
 			orderCrossCity.setBillNo(no);
+            orderCrossCity.setPayTime(new Date());
 			this.updateById(orderCrossCity);
 			
 			UserInfo userInfo = userInfoService.selectById(orderCrossCity.getUserId());

--
Gitblit v1.7.1