java/IgoTravel.git

			@@ -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());