java/IgoTravel.git

			@@ -406,10 +406,10 @@
			*/
			@ResponseBody
			@PostMapping("/api/order/queryOrderInfo")
			@ApiOperation(value = "获取服务中的详情数据", tags = {"用户端-服务中"}, notes = "")
			@ApiOperation(value = "获取服务中的详情数据【1.0】", tags = {"用户端-服务中"}, notes = "")
			@ApiImplicitParams({
			@ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
			@ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=城际）", name = "orderType", required = true, dataType = "int"),
			@ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=城际，4=同城小件，5=跨城小件）", name = "orderType", required = true, dataType = "int"),
			@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
			})
			public ResultUtil<OrderInfoWarpper> queryOrderInfo(Integer orderId, Integer orderType){
			@@ -424,6 +424,12 @@
			break;
			case 3://跨城
			map = orderCrossCityService.queryOrderInfo(orderId);
			break;
			case 4://同城小件
			map = orderLogisticsService.queryOrderInfo(orderId);
			break;
			case 5://跨城小件
			map = orderLogisticsService.queryOrderInfo(orderId);
			break;
			}
			if(map.get("telX") != null){
			@@ -444,7 +450,6 @@
			orderInfoWarpper.setOrderPositionList(list);
			}
			return ResultUtil.success(orderInfoWarpper);
			//return ResultUtil.success(OrderInfoWarpper.getOrderInfoWarpper(map));
			}catch (Exception e){
			e.printStackTrace();
			return ResultUtil.runErr();
			@@ -461,10 +466,10 @@
			*/
			@ResponseBody
			@PostMapping("/base/order/queryOrderInfo_")
			@ApiOperation(value = "获取服务中的详情数据", tags = {"分享专用"}, notes = "")
			@ApiOperation(value = "获取服务中的详情数据【1.0】", tags = {"分享专用"}, notes = "")
			@ApiImplicitParams({
			@ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
			@ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=城际）", name = "orderType", required = true, dataType = "int"),
			@ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=城际，4=同城小件，5=跨城小件）", name = "orderType", required = true, dataType = "int"),
			})
			public ResultUtil<OrderInfoWarpper> queryOrderInfo_(Integer orderId, Integer orderType){
			try {
			@@ -478,6 +483,12 @@
			break;
			case 3://跨城
			map = orderCrossCityService.queryOrderInfo(orderId);
			break;
			case 4://同城小件
			map = orderLogisticsService.queryOrderInfo(orderId);
			break;
			case 5://跨城小件
			map = orderLogisticsService.queryOrderInfo(orderId);
			break;
			}
			if(null != map.get("telX")){
			@@ -498,7 +509,7 @@
			* 获取订单取消支付页面详情
			* @param orderId
			* @param orderType
			* @return
			* @。，；
			*/
			@ResponseBody
			@PostMapping("/api/order/queryCancelPage")
			@@ -856,7 +867,7 @@
			@ApiImplicitParams({
			@ApiImplicitParam(value = "订单id", name = "id", required = true, dataType = "int"),
			@ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=跨城）", name = "orderType", required = true, dataType = "int"),
			@ApiImplicitParam(value = "支付方式（1=微信，2=支付宝,3=余额）", name = "payType", required = true, dataType = "int"),
			@ApiImplicitParam(value = "支付方式（1=手机支付，2=银行卡支付,3=余额）", name = "payType", required = true, dataType = "int"),
			@ApiImplicitParam(value = "取消单id（取消操作返回）", name = "cancleId", required = false, dataType = "int"),
			@ApiImplicitParam(value = "支付端（1=用户APP端，2=司机APP端，3=用户小程序端）", name = "type", required = true, dataType = "int"),
			@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
			@@ -928,7 +939,7 @@
			@ApiOperation(value = "支付页面获取可用优惠券数量和余额", tags = {"用户端-出租车", "用户端-专车", "用户端-跨城"}, notes = "balance=余额，coupon=优惠券")
			@ApiImplicitParams({
			@ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
			@ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=跨城）", name = "orderType", required = true, dataType = "int"),
			@ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=跨城，4=同城小件，5=跨城小件）", name = "orderType", required = true, dataType = "int"),
			@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
			})
			public ResultUtil queryBalance(Integer orderId, Integer orderType, HttpServletRequest request){
			@@ -999,6 +1010,12 @@
			case 3:
			list = orderCrossCityService.queryCoupon(orderId, uid, pageNum, size);
			break;
			// case 4:
			// list = orderLogisticsService.queryCoupon(orderId, uid, pageNum, size);
			// break;
			// case 5:
			// list = orderLogisticsService.queryCoupon(orderId, uid, pageNum, size);
			// break;
			}
			return ResultUtil.success(CouponWarpper.getCouponWarppers(list));
			}catch (Exception e){
			@@ -1021,9 +1038,9 @@
			@PostMapping("/api/taxi/payTaxiOrder")
			@ApiOperation(value = "订单完成支付订单操作", tags = {"用户端-出租车", "用户端-专车", "用户端-跨城", "用户端-小件物流"}, notes = "")
			@ApiImplicitParams({
			@ApiImplicitParam(value = "支付方式(1=微信，2=支付宝，3=余额)", name = "payType", required = true, dataType = "int"),
			@ApiImplicitParam(value = "支付方式(1=手机支付，2=银行卡支付，3=余额，4=线下支付)", name = "payType", required = true, dataType = "int"),
			@ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
			@ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=跨城，4=小件物流）", name = "orderType", required = true, dataType = "int"),
			@ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=跨城，4=同城小件物流，5=跨城小件物流）", name = "orderType", required = true, dataType = "int"),
			@ApiImplicitParam(value = "优惠券id", name = "couponId", required = false, dataType = "int"),
			@ApiImplicitParam(value = "支付端（1=用户APP端，2=司机APP端，3=用户小程序端）", name = "type", required = true, dataType = "int"),
			@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")