java/IgoTravel.git

			@@ -117,12 +117,15 @@
			@ApiImplicitParams({
			@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
			})
			public ResultUtil<List<OrderStatusWarpper>> queryServingOrder(HttpServletRequest request){
			public ResultUtil<List<OrderStatusWarpper>> queryServingOrder(Integer language, HttpServletRequest request){
			try {
			Integer uid = userInfoService.getUserIdFormRedis(request);
			if(null == uid){
			return ResultUtil.tokenErr();
			}
			UserInfo userInfo = userInfoService.selectById(uid);
			userInfo.setLanguage(language);
			userInfoService.updateById(userInfo);
			List<OrderStatusWarpper> data = new ArrayList<>();
			List<OrderPrivateCar> orderPrivateCars = orderPrivateCarService.queryOrder(uid, 1, 2, 3, 4, 5, 6, 7, 11, 12);
			for(OrderPrivateCar orderPrivateCar : orderPrivateCars){
			@@ -193,19 +196,19 @@
			List<Map<String, Object>> list = null;
			switch (type){
			case 1:
			list = orderPrivateCarService.queryMyOrderList(uid, pageNum, size);
			list = orderPrivateCarService.queryMyOrderList(language, uid, pageNum, size);
			break;
			case 2:
			list = orderTaxiService.queryMyOrderList(uid, pageNum, size);
			list = orderTaxiService.queryMyOrderList(language, uid, pageNum, size);
			break;
			case 3:
			list = orderCrossCityService.queryMyOrderList(uid, pageNum, size);
			list = orderCrossCityService.queryMyOrderList(language, uid, pageNum, size);
			break;
			case 4:
			list = orderLogisticsService.queryMyOrderList(uid, pageNum, size, language);
			break;
			case 5:
			list = orderCharteredCarService.queryMyOrderList(uid, pageNum, size);
			list = orderCharteredCarService.queryMyOrderList(language, uid, pageNum, size);
			break;
			}
			return ResultUtil.success(OrderWarpper.getOrderWarpper(list));
			@@ -238,22 +241,22 @@
			}
			String name = language == 1 ? "打车" : language == 2 ? "Ride" : "Course";
			pageNum = (pageNum - 1) * size;
			List<Map<String, Object>> maps = orderCancelService.queryCancel(uid, 2);
			List<Map<String, Object>> maps = orderCancelService.queryCancel(language, uid, 2);
			for (Map<String, Object> map : maps) {
			Integer orderType = Integer.valueOf(map.get("orderType").toString());
			if(1 == orderType){
			map.put("name", language == 1 ? "打车订单取消" : language == 2 ? "Ride order cancelled" : "Commande de trajet annulée");
			}
			if(4 == orderType){
			map.put("name", language == 1 ? "包裹订单取消" : language == 2 ? "Parcel order cancellation" : "Annulation de commande de colis");
			map.put("name", language == 1 ? "包裹订单取消" : language == 2 ? "Parcel order cancellation" : "Annulation de commande de livraison");
			}
			}
			List<Map<String, Object>> list = orderPrivateCarService.queryMyTravelRecord(uid);//专车
			List<Map<String, Object>> list = orderPrivateCarService.queryMyTravelRecord(language, uid);//专车
			for (Map<String, Object> map : list) {
			map.put("name", name);
			}
			name = language == 1 ? "包裹" : language == 2 ? "Package" : "Livraison";
			List<Map<String, Object>> list3 = orderLogisticsService.queryMyTravelRecord(uid);//小件物流
			name = language == 1 ? "包裹" : language == 2 ? "Delivery" : "Livraison";
			List<Map<String, Object>> list3 = orderLogisticsService.queryMyTravelRecord(language, uid);//小件物流
			for (Map<String, Object> map : list3) {
			map.put("name", name);
			}
			@@ -264,7 +267,7 @@
			for(TransactionDetails transactionDetails1 : transactionDetails){
			Map<String, Object> map = new HashMap<>();
			map.put("money", transactionDetails1.getMoney());
			map.put("time", sdf.format(transactionDetails1.getInsertTime()));
			map.put("time", DateUtil.conversionFormat(language, sdf.format(transactionDetails1.getInsertTime())));
			map.put("name", "跨城订单取消退款");
			map.put("insertTime", Double.valueOf(transactionDetails1.getInsertTime().getTime() / 1000).intValue());
			list4.add(map);
			@@ -320,7 +323,7 @@
			@ApiImplicitParam(value = "页条数", name = "size", required = true, dataType = "int"),
			@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
			})
			public ResultUtil<List<OrderWarpper>> queryInvoiceOrder(Integer type, Integer orderType, Date startTime,
			public ResultUtil<List<OrderWarpper>> queryInvoiceOrder(Integer language, Integer type, Integer orderType, Date startTime,
			Date endTime, Double startMoney, Double endMoney,
			Integer pageNum, Integer size, HttpServletRequest request){
			pageNum = (pageNum - 1) * size;
			@@ -333,7 +336,7 @@
			if(null != orderType){
			switch (orderType){
			case 1://专车
			list = orderPrivateCarService.queryInvoiceOrder(type, startTime, endTime, startMoney, endMoney, uid);
			list = orderPrivateCarService.queryInvoiceOrder(language, type, startTime, endTime, startMoney, endMoney, uid);
			break;
			// case 2://出租车
			// list = orderTaxiService.queryInvoiceOrder(type, startTime, endTime, startMoney, endMoney, uid);
			@@ -342,7 +345,7 @@
			// list = orderCrossCityService.queryInvoiceOrder(type, startTime, endTime, startMoney, endMoney, uid);
			// break;
			case 4://同城小件物流
			list = orderLogisticsService.queryInvoiceOrder(type, startTime, endTime, startMoney, endMoney, uid, orderType);
			list = orderLogisticsService.queryInvoiceOrder(language, type, startTime, endTime, startMoney, endMoney, uid, orderType);
			break;
			// case 5://跨城小件物流
			// list = orderLogisticsService.queryInvoiceOrder(type, startTime, endTime, startMoney, endMoney, uid, orderType);
			@@ -350,7 +353,7 @@
			}
			}else{
			//专车
			List<Map<String, Object>> maps = orderPrivateCarService.queryInvoiceOrder(type, startTime, endTime, startMoney, endMoney, uid);
			List<Map<String, Object>> maps = orderPrivateCarService.queryInvoiceOrder(language, type, startTime, endTime, startMoney, endMoney, uid);
			list.addAll(maps);
			// //出租车
			// List<Map<String, Object>> list1 = orderTaxiService.queryInvoiceOrder(type, startTime, endTime, startMoney, endMoney, uid);
			@@ -359,7 +362,7 @@
			// List<Map<String, Object>> list2 = orderCrossCityService.queryInvoiceOrder(type, startTime, endTime, startMoney, endMoney, uid);
			// list.addAll(list2);
			//同城小件物流
			List<Map<String, Object>> list3 = orderLogisticsService.queryInvoiceOrder(type, startTime, endTime, startMoney, endMoney, uid, orderType);
			List<Map<String, Object>> list3 = orderLogisticsService.queryInvoiceOrder(language, type, startTime, endTime, startMoney, endMoney, uid, orderType);
			list.addAll(list3);
			// //跨城小件物流
			// List<Map<String, Object>> list4 = orderLogisticsService.queryInvoiceOrder(type, startTime, endTime, startMoney, endMoney, uid, orderType);
			@@ -434,30 +437,39 @@
			@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){
			public ResultUtil<OrderInfoWarpper> queryOrderInfo(Integer orderId, Integer orderType, Integer language){
			try {
			Map<String, Object> map = null;
			switch (orderType){
			case 1://专车
			map = orderPrivateCarService.queryOrderInfo(orderId);
			map = orderPrivateCarService.queryOrderInfo(language, orderId);
			break;
			case 2://出租车
			map = orderTaxiService.queryOrderInfo(orderId);
			map = orderTaxiService.queryOrderInfo(language, orderId);
			break;
			case 3://跨城
			map = orderCrossCityService.queryOrderInfo(orderId);
			map = orderCrossCityService.queryOrderInfo(language, orderId);
			break;
			case 4://同城小件
			map = orderLogisticsService.queryOrderInfo(orderId);
			map = orderLogisticsService.queryOrderInfo(language, orderId);
			break;
			case 5://跨城小件
			map = orderLogisticsService.queryOrderInfo(orderId);
			map = orderLogisticsService.queryOrderInfo(language, orderId);
			break;
			}
			if(map.get("telX") != null){
			map.put("driverPhone", map.get("telX"));
			}
			OrderInfoWarpper orderInfoWarpper = OrderInfoWarpper.getOrderInfoWarpper(map);
			String driverName = orderInfoWarpper.getDriverName();
			if(language == 2){
			driverName = "Master " + driverName.replace("师傅", "");
			}
			if(language == 3){
			driverName = "Maître " + driverName.replace("师傅", "");
			}
			orderInfoWarpper.setDriverName(driverName);

			File file = new File(filePath + orderId + "_1.txt");
			if(file.exists()){
			//读取文件(字符流)
			@@ -493,31 +505,39 @@
			@ApiImplicitParam(value = "订单id", name = "orderId", 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){
			public ResultUtil<OrderInfoWarpper> queryOrderInfo_(Integer orderId, Integer orderType, Integer language){
			try {
			Map<String, Object> map = null;
			switch (orderType){
			case 1://专车
			map = orderPrivateCarService.queryOrderInfo(orderId);
			map = orderPrivateCarService.queryOrderInfo(language, orderId);
			break;
			case 2://出租车
			map = orderTaxiService.queryOrderInfo(orderId);
			map = orderTaxiService.queryOrderInfo(language, orderId);
			break;
			case 3://跨城
			map = orderCrossCityService.queryOrderInfo(orderId);
			map = orderCrossCityService.queryOrderInfo(language, orderId);
			break;
			case 4://同城小件
			map = orderLogisticsService.queryOrderInfo(orderId);
			map = orderLogisticsService.queryOrderInfo(language, orderId);
			break;
			case 5://跨城小件
			map = orderLogisticsService.queryOrderInfo(orderId);
			map = orderLogisticsService.queryOrderInfo(language, orderId);
			break;
			}
			if(null != map.get("telX")){
			map.put("driverPhone", map.get("telX"));
			}

			return ResultUtil.success(OrderInfoWarpper.getOrderInfoWarpper(map));
			OrderInfoWarpper orderInfoWarpper = OrderInfoWarpper.getOrderInfoWarpper(map);
			String driverName = orderInfoWarpper.getDriverName();
			if(language == 2){
			driverName = "Master " + driverName.replace("师傅", "");
			}
			if(language == 3){
			driverName = "Maître " + driverName.replace("师傅", "");
			}
			orderInfoWarpper.setDriverName(driverName);
			return ResultUtil.success(orderInfoWarpper);
			}catch (Exception e){
			e.printStackTrace();
			return ResultUtil.runErr();
			@@ -541,27 +561,36 @@
			@ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=城际）", name = "orderType", required = true, dataType = "int"),
			@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
			})
			public ResultUtil<OrderInfoWarpper> queryCancelPage(Integer orderId, Integer orderType){
			public ResultUtil<OrderInfoWarpper> queryCancelPage(Integer orderId, Integer orderType, Integer language){
			try {
			Map<String, Object> map = null;
			switch (orderType) {
			case 1://专车
			map = orderPrivateCarService.queryOrderInfo(orderId);
			ResultUtil<BaseWarpper> res = orderPrivateCarService.queryCancleAmount(orderId);
			map = orderPrivateCarService.queryOrderInfo(language, orderId);
			ResultUtil<BaseWarpper> res = orderPrivateCarService.queryCancleAmount(orderId, language);
			map.put("cancelPayMoney", res.getData().getAmount());
			break;
			case 2://出租车
			map = orderTaxiService.queryOrderInfo(orderId);
			map = orderTaxiService.queryOrderInfo(language, orderId);
			ResultUtil<BaseWarpper> re = orderTaxiService.queryCancleAmount(orderId);
			map.put("cancelPayMoney", re.getData().getAmount());
			break;
			case 3://跨城
			map = orderCrossCityService.queryOrderInfo(orderId);
			map = orderCrossCityService.queryOrderInfo(language, orderId);
			ResultUtil<BaseWarpper> r = orderCrossCityService.queryCancleAmount(orderId);
			map.put("cancelPayMoney", r.getData().getAmount());
			break;
			}
			return ResultUtil.success(OrderInfoWarpper.getOrderInfoWarpper(map));
			OrderInfoWarpper orderInfoWarpper = OrderInfoWarpper.getOrderInfoWarpper(map);
			String driverName = orderInfoWarpper.getDriverName();
			if(language == 2){
			driverName = "Master " + driverName.replace("师傅", "");
			}
			if(language == 3){
			driverName = "Maître " + driverName.replace("师傅", "");
			}
			orderInfoWarpper.setDriverName(driverName);
			return ResultUtil.success(orderInfoWarpper);
			}catch (Exception e){
			e.printStackTrace();
			return ResultUtil.runErr();
			@@ -810,11 +839,11 @@
			@ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=跨城）", name = "orderType", required = true, dataType = "int"),
			@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
			})
			public ResultUtil<BaseWarpper> queryCancleAmount(Integer id, Integer orderType){
			public ResultUtil<BaseWarpper> queryCancleAmount(Integer id, Integer orderType, Integer language){
			try {
			switch (orderType){
			case 1:
			return orderPrivateCarService.queryCancleAmount(id);
			return orderPrivateCarService.queryCancleAmount(id, language);
			case 2:
			return orderTaxiService.queryCancleAmount(id);
			case 3:
			@@ -1059,7 +1088,7 @@
			@ApiImplicitParam(value = "页条数", name = "size", required = true, dataType = "int"),
			@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
			})
			public ResultUtil queryCoupon(Integer orderId, Integer orderType, Integer pageNum, Integer size, HttpServletRequest request){
			public ResultUtil queryCoupon(Integer language, Integer orderId, Integer orderType, Integer pageNum, Integer size, HttpServletRequest request){
			try {
			Integer uid = userInfoService.getUserIdFormRedis(request);
			if(null == uid){
			@@ -1068,7 +1097,7 @@
			List<Map<String, Object>> list = new ArrayList<>();
			switch (orderType){
			case 1:
			list = orderPrivateCarService.queryCoupon(orderId, uid, pageNum, size);
			list = orderPrivateCarService.queryCoupon(language, orderId, uid, pageNum, size);
			break;
			// case 2:
			// list = orderTaxiService.queryCoupon(orderId, uid, pageNum, size);
			@@ -1231,6 +1260,7 @@
			@ApiImplicitParams({
			@ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
			@ApiImplicitParam(value = "订单类型", name = "orderType", required = true, dataType = "int"),
			@ApiImplicitParam(value = "语言", name = "language", required = true, dataType = "int"),
			@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
			})
			public ResultUtil shareRedEnvelope(Integer orderId, Integer orderType, Integer language){