From 4485600cb2549dae5e18901aa3ac8ed34fc68ca3 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 05 八月 2025 18:40:24 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index 18b26df..cc9a69f 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -2230,7 +2230,7 @@
}else{
//拉起支付
TradePayOff1Data tradePayOff1Data = new TradePayOff1Data();
- tradePayOff1Data.setPartnerPayId("PR" + orderPrivateCar.getId());
+ tradePayOff1Data.setPartnerPayId(orderPrivateCar.getTravelId());
tradePayOff1Data.setTotalFee(Double.valueOf(orderMoney * 100).intValue() + "");
tradePayOff1Data.setRetUrl(path);
tradePayOff1Data.setClientIp(ip);
@@ -2737,7 +2737,7 @@
paymentRecordService.updateById(query);
OpenCity openCity = openCityService.openCity1(orderPrivateCar.getStartLon().toString(), orderPrivateCar.getStartLat().toString());
SysIntegral query1 = sysIntegralMapper.query(openCity.getId());
- System.out.println("query1:" + query1);
+// System.out.println("query1:" + query1);
userInfo.setIntegral(userInfo.getIntegral() + (query.getAmount().intValue() * query1.getIntegral()));//积分
//添加交易明细
--
Gitblit v1.7.1