From 574cd41b6e4aa65426c7597297aa94f6259d6666 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 21 八月 2025 18:57:26 +0800
Subject: [PATCH] 修改bug
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 0e5f52a..d34c2b8 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
@@ -973,7 +973,7 @@
// return ResultUtil.error("司机已到达预约点，取消会产生一定的费用");
// }
if (orderPrivateCar.getState() >= 5 && orderPrivateCar.getState() != 11) {
- return ResultUtil.error("取消订单失败，不合法的操作");
+ return ResultUtil.error("订单已取消，请刷新页面");
}
Integer number1 = this.selectCount(new EntityWrapper<OrderPrivateCar>().eq("pid", orderPrivateCar.getPid() == null ? orderPrivateCar.getId() : orderPrivateCar.getPid()).lt("state", 6));
Integer number2 = this.selectCount(new EntityWrapper<OrderPrivateCar>().eq("id", orderPrivateCar.getPid() == null ? orderPrivateCar.getId() : orderPrivateCar.getPid()).lt("state", 6));
@@ -1105,7 +1105,7 @@
return ResultUtil.error("取消订单失败，订单信息有误", "");
}
if (orderPrivateCar.getState() != 12) {
- return ResultUtil.error("取消订单失败，不合法的操作", "");
+ return ResultUtil.error("订单已取消，请刷新页面", "");
}
OrderCancel orderCancel = null;
if (null == cancleId) {
@@ -2139,6 +2139,7 @@
orderMoney = new BigDecimal(orderMoney).setScale(2, RoundingMode.HALF_UP).doubleValue();
System.out.println("!!!" + orderMoney + "!!!!");
orderMoney = orderMoney < 0 ? 0 : orderMoney;
+ orderPrivateCar.setPayMoney(orderMoney);
if (payType == 1) {//微信支付
if (orderMoney == 0) {
return ResultUtil.error("请使用余额支付");
@@ -2274,7 +2275,6 @@
orderPrivateCar.setState(8);
orderPrivateCar.setPayType(3);
- orderPrivateCar.setPayMoney(orderMoney);
//处理优惠券和红包
if (null != userCouponRecord) {
--
Gitblit v1.7.1