java/IgoTravel.git

			@@ -17,6 +17,7 @@
			import com.stylefeng.guns.modular.system.util.EmailUtil;
			import com.stylefeng.guns.modular.system.util.ResultUtil;
			import com.stylefeng.guns.modular.system.warpper.*;
			import com.stylefeng.guns.modular.system.warpper.BalanceUsageRecord;
			import com.stylefeng.guns.modular.taxi.model.OrderTaxi;
			import com.stylefeng.guns.modular.taxi.service.IOrderTaxiService;
			import io.swagger.annotations.Api;
			@@ -89,6 +90,9 @@

			@Resource
			private DriverActivityHistoryMapper driverActivityHistoryMapper;

			@Resource
			private IBalanceUsageRecordService balanceUsageRecordService;



			@@ -1179,7 +1183,7 @@
			*/
			@ResponseBody
			@PostMapping("/api/driver/queryTotalRevenue")
			@ApiOperation(value = "获取收入明细【2.0】", tags = {"司机端-个人中心"}, notes = "开发中")
			@ApiOperation(value = "获取收入明细【2.0】", tags = {"司机端-个人中心"}, notes = "")
			@ApiImplicitParams({
			@ApiImplicitParam(value = "页码，首页1", name = "pageNum", required = true, dataType = "int"),
			@ApiImplicitParam(value = "页条数", name = "size", required = true, dataType = "int"),
			@@ -1192,7 +1196,7 @@
			return ResultUtil.tokenErr();
			}
			List<Map<String, Object>> list = driverService.queryTotalRevenue(language, uid, pageNum, size);

			// TODO 待翻译
			List<BaseWarpper> data = new ArrayList<>();
			for(Map<String, Object> map : list){
			String type = map.get("type").toString();
			@@ -1202,7 +1206,8 @@
			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");
			OrderPrivateCar orderPrivateCar = orderPrivateCarService.selectById(map.get("incomeId").toString());
			baseWarpper.setName(language == 1 ? (orderPrivateCar.getCancelMidway() == 0 ? "" : "【途中取消】") + "打车" : language == 2 ? (orderPrivateCar.getCancelMidway() == 0 ? "" : "【】") + "Ride" : (orderPrivateCar.getCancelMidway() == 0 ? "" : "【】") + "Course");
			break;
			case 2:
			baseWarpper.setName(language == 1 ? "出租车" : language == 2 ? "taxi" : "taxi");
			@@ -1211,7 +1216,8 @@
			baseWarpper.setName(language == 1 ? "城际出行" : language == 2 ? "Intercity travel" : "Mobilité entre villes");
			break;
			case 4:
			baseWarpper.setName(language == 1 ? "包裹" : language == 2 ? "Delivery" : "Livraison");
			OrderLogistics orderLogistics = orderLogisticsService.selectById(map.get("incomeId").toString());
			baseWarpper.setName(language == 1 ? (orderLogistics.getCancelMidway() == 0 ? "" : "【途中取消】") + "包裹" : language == 2 ? (orderLogistics.getCancelMidway() == 0 ? "" : "【】") + "Delivery" : (orderLogistics.getCancelMidway() == 0 ? "" : "【】") + "Livraison");
			break;
			case 5:
			baseWarpper.setName(language == 1 ? "跨城小件物流" : language == 2 ? "Cross-city small parts logistics" : "Logistique des petites pièces à travers la ville");
			@@ -1252,10 +1258,9 @@
			case 4:
			OrderLogistics orderLogistics = orderLogisticsService.selectById(map.get("incomeId").toString());
			List<Income> incomes3 = incomeService.queryData(1, null, 2, orderLogistics.getId(), 4);
			map1.put("travelMoney", orderLogistics != null ? orderLogistics.getOrderMoney() : 0);//行程费
			map1.put("parkMoney", 0);//停车费
			map1.put("parkMoney", orderLogistics != null ? orderLogistics.getParkMoney() : 0);//停车费
			map1.put("tipMoney", 0);//小费
			map1.put("roadTollMoney", 0);//过路费
			map1.put("roadTollMoney", orderLogistics != null ? orderLogistics.getRoadTollMoney() : 0);//过路费
			map1.put("rakeMoney", incomes3.size() > 0 ? incomes3.get(0).getMoney() : 0);//抽成
			break;
			case 5:
			@@ -1695,23 +1700,23 @@

			@ResponseBody
			@PostMapping("/api/driver/queryBalanceUsageRecord")
			@ApiOperation(value = "获取余额使用记录【2.0】", tags = {"司机端-个人中心"}, notes = "开发中")
			@ApiOperation(value = "获取余额使用记录【2.0】", tags = {"司机端-个人中心"}, notes = "")
			@ApiImplicitParams({
			@ApiImplicitParam(value = "页码，首页1", name = "pageNum", required = true, dataType = "int"),
			@ApiImplicitParam(value = "页条数", name = "size", required = true, dataType = "int"),
			@ApiImplicitParam(value = "体现类型（1=活动收入提现，2=业务收入提现）", name = "type", required = true, dataType = "int"),
			@ApiImplicitParam(value = "体现类型（1=活动收入，2=业务收入）", name = "type", required = true, dataType = "int"),
			@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
			})
			public ResultUtil<BalanceUsageRecord> queryWithdrawal(Integer language, Integer pageNum, Integer size, Integer type, HttpServletRequest request){
			public ResultUtil<BalanceUsageRecord> queryBalanceUsageRecord(Integer language, Integer pageNum, Integer size, Integer type, HttpServletRequest request){
			try {
			Integer uid = driverService.getUserIdFormRedis(request);
			if(null == uid){
			return ResultUtil.tokenErr();
			}
			BalanceUsageRecord withdrawalWarpper1 = new BalanceUsageRecord();
			withdrawalWarpper1.setTotal(0D);
			withdrawalWarpper1.setList(new ArrayList<BalanceUsageRecordList>());
			return ResultUtil.success(withdrawalWarpper1);
			BalanceUsageRecord balanceUsageRecord = new BalanceUsageRecord();
			balanceUsageRecord.setTotal(balanceUsageRecordService.queryBalanceUsageRecordSum(uid, type));
			balanceUsageRecord.setList(balanceUsageRecordService.queryBalanceUsageRecord(language, uid, type, pageNum, size));
			return ResultUtil.success(balanceUsageRecord);
			}catch (Exception e){
			e.printStackTrace();
			return ResultUtil.runErr();