java/IgoTravel.git

			@@ -3,6 +3,7 @@
			import com.alibaba.fastjson.JSON;
			import com.alibaba.fastjson.JSONArray;
			import com.baomidou.mybatisplus.mapper.EntityWrapper;
			import com.google.api.client.http.UrlEncodedParser;
			import com.stylefeng.guns.core.util.ToolUtil;
			import com.stylefeng.guns.modular.CharteredCar.server.IOrderCharteredCarService;
			import com.stylefeng.guns.modular.crossCity.model.OrderCrossCity;
			@@ -27,8 +28,12 @@
			import io.swagger.annotations.ApiImplicitParam;
			import io.swagger.annotations.ApiImplicitParams;
			import io.swagger.annotations.ApiOperation;
			import org.apache.commons.lang.StringEscapeUtils;
			import org.apache.http.client.utils.URLEncodedUtils;
			import org.bouncycastle.util.encoders.UrlBase64Encoder;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.beans.factory.annotation.Value;
			import org.springframework.util.StringUtils;
			import org.springframework.web.bind.annotation.*;

			import javax.annotation.Resource;
			@@ -37,6 +42,8 @@
			import java.io.*;
			import java.math.BigDecimal;
			import java.math.RoundingMode;
			import java.net.URLDecoder;
			import java.net.URLEncoder;
			import java.text.SimpleDateFormat;
			import java.util.*;

			@@ -917,6 +924,20 @@
			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;", ">");
			switch (orderType){
			case 1:
			return orderPrivateCarService.addCancle(id, reason, remark, uid, lon, lat, address, language);
			@@ -937,8 +958,9 @@
			return ResultUtil.runErr();
			}
			}





			/**
			* 取消订单退款回调
			* @param request