java/IgoTravel.git

			@@ -1166,9 +1166,11 @@

			List<BaseWarpper> data = new ArrayList<>();
			for(Map<String, Object> map : list){
			String type = map.get("type").toString();
			BaseWarpper baseWarpper = new BaseWarpper();
			baseWarpper.setDay(String.valueOf(null != map.get("time") ? map.get("time") : ""));
			baseWarpper.setAmount(Double.valueOf(String.valueOf(null != map.get("money") ? map.get("money") : 0)));
			if("2".equals(type)){
			switch (Integer.valueOf(String.valueOf(null != map.get("orderType") ? map.get("orderType") : 0))){
			case 1:
			baseWarpper.setName(language == 1 ? "打车" : language == 2 ? "Ride" : "Course");
			@@ -1180,7 +1182,7 @@
			baseWarpper.setName(language == 1 ? "城际出行" : language == 2 ? "Intercity travel" : "Mobilité entre villes");
			break;
			case 4:
			baseWarpper.setName(language == 1 ? "包裹" : language == 2 ? "Package" : "Livraison");
			baseWarpper.setName(language == 1 ? "包裹" : language == 2 ? "Delivery" : "Livraison");
			break;
			case 5:
			baseWarpper.setName(language == 1 ? "跨城小件物流" : language == 2 ? "Cross-city small parts logistics" : "Logistique des petites pièces à travers la ville");
			@@ -1234,8 +1236,13 @@
			map1.put("rakeMoney", incomes4.size() > 0 ? incomes4.get(0).getMoney() : 0);//抽成
			break;
			}

			baseWarpper.setData(map1);
			}

			if("3".equals(type)){
			baseWarpper.setName(language == 1 ? "取消订单费用" : language == 2 ? "Cancellation fee" : "Frais d'annulation");
			baseWarpper.setData(new Object());
			}
			data.add(baseWarpper);
			}
			return ResultUtil.success(data);
			@@ -1320,7 +1327,7 @@
			if(null == uid){
			return ResultUtil.tokenErr();
			}
			SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");
			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
			List<ActivityWarpper> activityWarppers = driverService.queryMyActivity(uid, sdf.parse(time), language);
			return ResultUtil.success(activityWarppers);
			}catch (Exception e){