From 33632d86bbf74e922ce406d9032fadc90f6bba5e Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 02 七月 2025 18:58:13 +0800
Subject: [PATCH] 更新用户端功能
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 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 e905d03..3fca710 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
@@ -1092,23 +1092,23 @@
paymentRecordService.saveData(1, orderPrivateCar.getUserId(), 1, id, 1, 2, query.getMoney(), "", 1);//添加预支付数据
}
if(payType == 3){//余额支付
- if(userInfo.getBalance() != null && userInfo.getBalance() < query.getMoney()){
+ if (userInfo.getBalance() != null && userInfo.getBalance() < query.getMoney()) {
return ResultUtil.error("余额不足，无法完成支付");
}
- resultUtil= appOrderController.moneyPay(id,userInfo.getId(),query.getMoney());
- if(resultUtil.getCode()==500){
- return ResultUtil.error("电子余额不足，无法完成支付");
- }
+// resultUtil= appOrderController.moneyPay(id,userInfo.getId(),query.getMoney());
+// if(resultUtil.getCode()==500){
+// return ResultUtil.error("电子余额不足，无法完成支付");
+// }
userInfo.setBalance(new BigDecimal(userInfo.getBalance()).subtract(new BigDecimal(query.getMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
//添加交易明细
transactionDetailsService.saveData(uid, "快车取消订单", query.getMoney(), 2, 1, 1, 1, id);
userInfoService.updateById(userInfo);
-
+
//解除小号绑定
- if(orderPrivateCar.getBindId() != null){
+ if (orderPrivateCar.getBindId() != null) {
chinaMobileUtil.midAxbUnBindSend(orderPrivateCar.getBindId(), orderPrivateCar.getTelX(), (System.currentTimeMillis() + 600000));
}
-
+
orderPrivateCar.setState(10);
orderPrivateCar.setTelX("");
orderPrivateCar.setBindId("");
@@ -2609,23 +2609,23 @@
resultUtil = payMoneyUtil.alipay("感谢费", "感谢费", "", orderId + "_1_" + UUIDUtil.getRandomCode(5), money.toString(), "/base/aliPayThankYouFee");
paymentRecordService.saveData(3, uid, 1, orderId, 1, 2, money, "", 1);//添加预支付数据
}
- if(payType == 3){//余额支付
- if(userInfo.getBalance() == null || userInfo.getBalance() < money){
+ if(payType == 3) {//余额支付
+ if (userInfo.getBalance() == null || userInfo.getBalance() < money) {
return ResultUtil.error("余额不足，无法完成支付");
}
- resultUtil= appOrderController.moneyPay(orderId,userInfo.getId(),money);
- if(resultUtil.getCode()==500){
- return ResultUtil.error("电子余额不足，无法完成支付");
- }
+// resultUtil= appOrderController.moneyPay(orderId,userInfo.getId(),money);
+// if(resultUtil.getCode()==500){
+// return ResultUtil.error("电子余额不足，无法完成支付");
+// }
userInfo.setBalance(new BigDecimal(userInfo.getBalance()).subtract(new BigDecimal(money)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
-
+
SysIntegral query1 = sysIntegralMapper.query(orderPrivateCar.getCompanyId());
userInfo.setIntegral(userInfo.getIntegral() + (money.intValue() * query1.getIntegral()));//积分
-
+
//添加交易明细
transactionDetailsService.saveData(uid, "快车订单-感谢费", money, 2, 1, 1, 1, orderId);
userInfoService.updateById(userInfo);
-
+
orderPrivateCar.setThankYouFee(money);
this.updateById(orderPrivateCar);
--
Gitblit v1.7.1