java/IgoTravel.git

			@@ -789,21 +789,11 @@
			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);
			List<String> list = Arrays.asList(remark.split(" "));
			for(SensitiveWords s : sensitiveWords){
			List<String> str = new ArrayList<>();
			String lowerCase = s.getContent().toLowerCase();
			for (String s1 : list) {
			if(lowerCase.equals(s1.toLowerCase())){
			str.add("***");
			}else{
			str.add(s1);
			}
			}
			list = str;
			for(SensitiveWords s : sensitiveWords) {
			remark = remark.replaceAll(s.getContent().toLowerCase(), "***");
			}
			remark = list.stream().collect(Collectors.joining(" "));
			}
			}

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