From 155df5096da87c047ea5af3ce7f8b2284c02dd2d Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期六, 10 八月 2024 14:00:22 +0800
Subject: [PATCH] 修改2.0 bug
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 35 +++++++++++++++++++----------------
1 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
index 43aa8b6..7a4acac 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -924,20 +924,24 @@
if(null == uid){
return ResultUtil.tokenErr();
}
- reason = reason.replaceAll("& #40;", "(")
- .replaceAll("& #41;", ")")
- .replaceAll("& #40;", "(")
- .replaceAll("& #41;", ")")
- .replaceAll("& #39;", "'")
- .replaceAll("& lt;", "<")
- .replaceAll("& gt;", ">");
- remark = remark.replaceAll("& #40;", "(")
- .replaceAll("& #41;", ")")
- .replaceAll("& #40;", "(")
- .replaceAll("& #41;", ")")
- .replaceAll("& #39;", "'")
- .replaceAll("& lt;", "<")
- .replaceAll("& gt;", ">");
+ if(ToolUtil.isNotEmpty(reason)){
+ reason = reason.replaceAll("& #40;", "(")
+ .replaceAll("& #41;", ")")
+ .replaceAll("& #40;", "(")
+ .replaceAll("& #41;", ")")
+ .replaceAll("& #39;", "'")
+ .replaceAll("& lt;", "<")
+ .replaceAll("& gt;", ">");
+ }
+ if(ToolUtil.isNotEmpty(remark)){
+ remark = remark.replaceAll("& #40;", "(")
+ .replaceAll("& #41;", ")")
+ .replaceAll("& #40;", "(")
+ .replaceAll("& #41;", ")")
+ .replaceAll("& #39;", "'")
+ .replaceAll("& lt;", "<")
+ .replaceAll("& gt;", ">");
+ }
switch (orderType){
case 1:
return orderPrivateCarService.addCancle(id, reason, remark, uid, lon, lat, address, language);
@@ -1752,7 +1756,6 @@
return ResultUtil.tokenErr();
}
Double payMoney = 0D;
- Integer companyId = 1;
switch (orderType){
case 1:
OrderPrivateCar orderPrivateCar = orderPrivateCarService.selectById(orderId);
@@ -1776,7 +1779,7 @@
if(null != query1){
Integer orderNum=orderLogisticsService.selectCount(new EntityWrapper<OrderLogistics>().eq("userId", uid).eq("activityId",query1.getId()).last(" and to_days(getoffTime) = to_days(now())"));
if(query1.getDistance()*1000>orderLogistics.getMileage() && query1.getOrderNum()>orderNum){
- Double special = query1.getSpecial();
+ Double special = query1.getLogistics();
if(null != special){
double v = new BigDecimal(orderMoney1).multiply(new BigDecimal(special / 10)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
payMoney = v;
--
Gitblit v1.7.1