java/IgoTravel.git

			@@ -27,6 +27,7 @@
			import java.math.BigInteger;
			import java.text.SimpleDateFormat;
			import java.time.*;
			import java.time.format.DateTimeFormatter;
			import java.time.temporal.TemporalAdjusters;
			import java.util.*;
			import java.util.stream.Collectors;
			@@ -478,10 +479,18 @@
			res.add(grantVO);
			}


			// 总额
			total = total.add(redPackage).add(coupon).add(discount).add(driverConsume).add(driverWithdrawal1);
			// 已使用司机奖励合计
			driver = driverConsume.add(driverWithdrawal1);
			DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
			// 对集合进行排序
			res.sort((a, b) -> {
			LocalDateTime timeA = LocalDateTime.parse(a.getInsertTime(), formatter);
			LocalDateTime timeB = LocalDateTime.parse(b.getInsertTime(), formatter);
			return timeA.compareTo(timeB);
			});
			return res;
			}

			@@ -882,7 +891,7 @@
			// 已使用司机奖励合计
			driver = driverConsume.add(driverWithdrawal1);
			UseMoneyVO useMoneyVO = new UseMoneyVO();
			useMoneyVO.setTotal(total);
			useMoneyVO.setTotal(total.add(driver));
			useMoneyVO.setDiscount(discount);
			useMoneyVO.setRedPackage(redPackage);
			useMoneyVO.setCoupon(coupon);
			@@ -1006,6 +1015,7 @@
			;
			// 红包领取记录wrapper
			between3 = new EntityWrapper<UserRedPacketRecord>()
			.ne("state",0)
			;
			// 司机奖励
			between4 = new EntityWrapper<DriverActivityHistory>()
			@@ -1029,6 +1039,7 @@
			.between("insertTime", start, end);
			// 红包领取记录wrapper
			between3 = new EntityWrapper<UserRedPacketRecord>()
			.ne("state",0)
			.between("insertTime", start, end);
			// 司机奖励
			between4 = new EntityWrapper<DriverActivityHistory>()