From 31929207a91ad4d215f11401b17446cf09eefd2c Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 17 三月 2025 17:36:21 +0800
Subject: [PATCH] 添加用户手机号码的校验
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index 9a6eb28..5c162c7 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -59,6 +59,7 @@
import java.math.RoundingMode;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.stream.Collectors;
@Service
@@ -788,9 +789,10 @@
public ResultUtil addCancle(Integer id, String reason, String remark, Integer uid, Double lon, Double lat, String address, Integer language) throws Exception {
if(ToolUtil.isNotEmpty(remark)){
if(ToolUtil.isNotEmpty(remark)){
+ remark = remark.toLowerCase();
List<SensitiveWords> sensitiveWords = sensitiveWordsMapper.selectList(null);
- for(SensitiveWords s : sensitiveWords){
- remark = remark.replaceAll(s.getContent(), "***");
+ for(SensitiveWords s : sensitiveWords) {
+ remark = remark.replaceAll(s.getContent().toLowerCase(), "***");
}
}
}
@@ -907,10 +909,15 @@
for (int i = 0; i < 5; i++) {
updateTrip = fleetEngineUtil.updateTrip("CANCELED", (null != car ? car.getVehicleId() : null), null, orderPrivateCar.getTripId(), null, null, null, null);
if(updateTrip){
+ orderPrivateCar.setIsover(1);
+ this.updateById(orderPrivateCar);
break;
}
Thread.sleep(3000L);
}
+ }else{
+ orderPrivateCar.setIsover(1);
+ this.updateById(orderPrivateCar);
}
}
//添加消息
@@ -1016,11 +1023,7 @@
ChinaMobileUtil.midAxbUnBindSend(orderPrivateCar.getBindId(),orderPrivateCar.getTelX());
}
- if(5 == orderPrivateCar.getOldState()){
- orderPrivateCar.setState(6);
- }else{
- orderPrivateCar.setState(10);
- }
+ orderPrivateCar.setState(10);
orderPrivateCar.setTelX("");
orderPrivateCar.setBindId("");
this.updateById(orderPrivateCar);
@@ -2692,11 +2695,7 @@
if(null != query){
//添加交易明细
transactionDetailsService.saveData(orderPrivateCar.getUserId(), "取消订单", query.getAmount(), 2, 1, 1, 1, query.getOrderId());
- if(5 == orderPrivateCar.getOldState()){
- orderPrivateCar.setState(6);
- }else{
- orderPrivateCar.setState(10);
- }
+ orderPrivateCar.setState(10);
//解除小号绑定
if(orderPrivateCar.getBindId() != null){
ChinaMobileUtil.midAxbUnBindSend(orderPrivateCar.getBindId(),orderPrivateCar.getTelX());
--
Gitblit v1.7.1