From 68846b0e22d575b2d01b89dd9451b0a16382e9aa Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 16 九月 2025 17:16:16 +0800
Subject: [PATCH] 修改
---
UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index 725c6e7..60fc98e 100644
--- a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -35,6 +35,7 @@
import org.springframework.util.CollectionUtils;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
+import org.springframework.util.StringUtils;
import org.springframework.web.client.RestTemplate;
import javax.annotation.Resource;
@@ -1924,13 +1925,15 @@
transactionDetailsService.saveData(orderPrivateCar.getUserId(), "完成订单", query.getAmount(), 2, 1, 1, 1, query.getOrderId());
// orderPrivateCar.setState(8);
orderPrivateCar.setPayType(type);
- orderPrivateCar.setTransactionId(order_id);
+ if(!StringUtils.hasLength(orderPrivateCar.getTransactionId())){
+ orderPrivateCar.setTransactionId(order_id);
+ }
this.updateById(orderPrivateCar);
- UserInfo userInfo = userInfoService.selectById(orderPrivateCar.getUserId());
- SysIntegral query1 = sysIntegralMapper.query(orderPrivateCar.getCompanyId());
- userInfo.setIntegral(userInfo.getIntegral() + (query.getAmount().intValue() * query1.getIntegral()));//积分
- userInfoService.updateById(userInfo);
+// UserInfo userInfo = userInfoService.selectById(orderPrivateCar.getUserId());
+// SysIntegral query1 = sysIntegralMapper.query(orderPrivateCar.getCompanyId());
+// userInfo.setIntegral(userInfo.getIntegral() + (query.getAmount().intValue() * query1.getIntegral()));//积分
+// userInfoService.updateById(userInfo);
//处理优惠券和红包
if(null != orderPrivateCar.getCouponId()){
--
Gitblit v1.7.1