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){
			@@ -245,14 +248,14 @@
			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(language, uid);//专车
			for (Map<String, Object> map : list) {
			map.put("name", name);
			}
			name = language == 1 ? "包裹" : language == 2 ? "Package" : "Livraison";
			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);