java/IgoTravel.git

			@@ -15,6 +15,7 @@
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Controller;
			import org.springframework.ui.Model;
			import org.springframework.util.StringUtils;
			import org.springframework.web.bind.annotation.RequestMapping;
			import org.springframework.web.bind.annotation.ResponseBody;

			@@ -176,7 +177,7 @@
			.ne("type", 1)
			.isNotNull("orderType"));
			}else{
			if (time == 5 && insertTime==null){
			if (time == 5 && !StringUtils.hasLength(insertTime)){
			incomes = tIncomeService.selectList(new EntityWrapper<Income>()
			.eq("userType", 1)
			.eq("objectId",1)
			@@ -304,7 +305,7 @@
			}

			EntityWrapper<SettlementDetail> settlementDetailEntityWrapper = new EntityWrapper<>();
			if (time == 5 && insertTime==null){
			if (time == 5 && !StringUtils.hasLength(insertTime)){

			}else{
			settlementDetailEntityWrapper.between("createTime", start, end);
			@@ -333,21 +334,24 @@
			platformVO.setMoney(bigDecimal1);
			platformVO.setPayType("现金支付");
			if (settlementDetail.getSettlementRecordId()!=null){
			if (state!=null && state!=1){
			continue;
			}
			// 已结算
			platformVO.setState(1);
			SettlementRecord settlementRecord = settlementRecordService.selectById(settlementDetail.getSettlementRecordId());
			balance = balance.add(new BigDecimal(settlementDetail.getPrice()));
			platformVO.setEndTime(format.format(settlementRecord.getDay()));
			}else{
			if (state!=null && state!=2){
			continue;
			if (settlementRecord.getPaymentStatus()!=null && settlementRecord.getPaymentStatus()==2){
			if (state!=null && state!=1){
			continue;
			}
			// 已结算
			platformVO.setState(1);
			balance = balance.add(new BigDecimal(settlementDetail.getPrice()));
			platformVO.setEndTime(format.format(settlementRecord.getDay()));
			}else{
			// 未结算
			if (state!=null && state!=2){
			continue;
			}
			platformVO.setState(2);
			unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
			platformVO.setEndTime(format.format(settlementRecord.getDay()));
			}
			// 未结算
			platformVO.setState(2);
			unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
			}

			res.add(platformVO);
			@@ -372,21 +376,24 @@
			platformVO.setInsertTime(format.format(tOrderLogistics.getInsertTime()));
			platformVO.setPayType("现金支付");
			if (settlementDetail.getSettlementRecordId()!=null){
			if (state!=null && state!=1){
			continue;
			}
			// 已结算
			platformVO.setState(1);
			SettlementRecord settlementRecord = settlementRecordService.selectById(settlementDetail.getSettlementRecordId());
			balance = balance.add(new BigDecimal(settlementDetail.getPrice()));
			platformVO.setEndTime(format.format(settlementRecord.getDay()));
			}else{
			if (state!=null && state!=2){
			continue;
			if (settlementRecord.getPaymentStatus()!=null && settlementRecord.getPaymentStatus()==2){
			if (state!=null && state!=1){
			continue;
			}
			// 已结算
			platformVO.setState(1);
			balance = balance.add(new BigDecimal(settlementDetail.getPrice()));
			platformVO.setEndTime(format.format(settlementRecord.getDay()));
			}else{
			// 未结算
			if (state!=null && state!=2){
			continue;
			}
			platformVO.setState(2);
			unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
			platformVO.setEndTime(format.format(settlementRecord.getDay()));
			}
			// 未结算
			platformVO.setState(2);
			unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
			}
			res.add(platformVO);
			break;
			@@ -414,6 +421,16 @@
			@RequestMapping(value = "/water/getCount")
			@ResponseBody
			public Object getCount1(Integer time,String insertTime,Integer payType,Integer type) {
			if (payType!=null){
			switch (payType){
			case 1:
			payType = 2;
			break;
			case 2:
			payType = 1;
			break;
			}
			}
			if (time == null){
			time = 1;
			}
			@@ -495,7 +512,7 @@
			EntityWrapper<TOrderLogistics> tOrderLogisticsEntityWrapper = new EntityWrapper<>();
			// 司机手动结算金额
			Wrapper<SettlementDetail> orderType1 = new EntityWrapper<SettlementDetail>();
			if (time == 5 && insertTime==null){
			if (time == 5 && !StringUtils.hasLength(insertTime)){
			// 余额充值wrapper
			orderType = new EntityWrapper<TPubTransactionDetails>()
			.eq("userType",1)
			@@ -675,11 +692,9 @@
			break;
			}



			// 司机提现
			for (TPubWithdrawal tPubWithdrawal : driver) {
			if(payType!=null && payType == 2){
			if(payType!=null && payType == 1){
			break;
			}
			WaterVO waterVO = new WaterVO();
			@@ -700,11 +715,13 @@
			}
			// 用户提现
			for (TPubWithdrawal tPubWithdrawal : user) {
			if(payType!=null && payType == 2){
			if(payType!=null && payType == 1){
			break;
			}
			WaterVO waterVO = new WaterVO();
			waterVO.setInsertTime(format.format(tPubWithdrawal.getHandleTime()));
			if (tPubWithdrawal.getHandleTime()!=null){
			waterVO.setInsertTime(format.format(tPubWithdrawal.getHandleTime()));
			}
			waterVO.setCode(tPubWithdrawal.getCode());
			TUser user2 = appUserService.selectById(tPubWithdrawal.getUserId());
			if (user2!=null){
			@@ -724,6 +741,10 @@
			Integer orderId = tPubTransactionDetail.getOrderId();
			PaymentRecord paymentRecord = paymentRecordService.selectById(orderId);
			if (paymentRecord!=null){
			if (paymentRecord.getState() == 1){
			// 临时数据
			continue;
			}
			waterVO.setInsertTime(format.format(paymentRecord.getInsertTime()));
			waterVO.setCode(paymentRecord.getCode());
			if (paymentRecord.getPayType()!=null){
			@@ -772,11 +793,11 @@
			case 1:
			SettlementRecord settlementRecord = settlementRecordService.selectById(income.getSettlementRecordId());
			if (settlementRecord!=null){
			if (settlementRecord.getPayType()!=null){
			if (settlementRecord.getPaymentStatus()!=null && settlementRecord.getPaymentStatus() == 2){
			switch (settlementRecord.getPayType()){
			case 1:
			if (payType!=null){
			if (payType == 1){
			if (payType != 1){
			continue;
			}
			}
			@@ -784,7 +805,7 @@
			break;
			case 2:
			if (payType!=null){
			if (payType == 2){
			if (payType != 2){
			continue;
			}
			}
			@@ -795,6 +816,8 @@
			continue;
			}

			}else{
			continue;
			}
			}else{
			continue;
			@@ -835,12 +858,12 @@
			break;
			case 4:
			SettlementRecord settlementRecord1 = settlementRecordService.selectById(income.getSettlementRecordId());
			if (settlementRecord1==null){
			if (settlementRecord1!=null&& settlementRecord1.getPaymentStatus()!=null && settlementRecord1.getPaymentStatus() == 2){
			if (settlementRecord1.getPayType()!=null){
			switch (settlementRecord1.getPayType()){
			case 1:
			if (payType!=null){
			if (payType == 1){
			if (payType != 1){
			continue;
			}
			}
			@@ -848,7 +871,7 @@
			break;
			case 2:
			if (payType!=null){
			if (payType == 2){
			if (payType != 2){
			continue;
			}
			}
			@@ -860,6 +883,8 @@
			}

			}
			}else {
			continue;
			}
			// 小件物流
			// 查询订单信息
			@@ -890,6 +915,8 @@
			break;
			}
			}
			// 过滤掉res中insertTime未空的数据
			res.removeIf(waterVO -> waterVO.getInsertTime() == null);
			Collections.sort(res, Comparator.comparing(WaterVO::getInsertTime).reversed());
			WaterMoneyVO waterMoneyVO = new WaterMoneyVO();
			BigDecimal add = userRecharge.add(userConsume).add(balance).subtract(driverWithdrawal).subtract(userWithdrawal);
			@@ -916,6 +943,16 @@
			@RequestMapping(value = "/water/list")
			@ResponseBody
			public Object list1(Integer time,String insertTime,Integer payType,Integer type) {
			if (payType!=null){
			switch (payType){
			case 1:
			payType = 2;
			break;
			case 2:
			payType = 1;
			break;
			}
			}
			if (time == null){
			time = 1;
			}
			@@ -997,7 +1034,7 @@
			EntityWrapper<TOrderLogistics> tOrderLogisticsEntityWrapper = new EntityWrapper<>();
			// 司机手动结算金额
			Wrapper<SettlementDetail> orderType1 = new EntityWrapper<SettlementDetail>();
			if (time == 5 && insertTime==null){
			if (time == 5 && !StringUtils.hasLength(insertTime)){
			// 余额充值wrapper
			orderType = new EntityWrapper<TPubTransactionDetails>()
			.eq("userType",1)
			@@ -1112,7 +1149,6 @@
			continue;
			}
			}

			WaterVO waterVO = new WaterVO();
			waterVO.setInsertTime(format.format(tOrderPrivateCar.getInsertTime()));
			waterVO.setType("用户订单消费");
			@@ -1181,7 +1217,7 @@
			}
			// 司机提现
			for (TPubWithdrawal tPubWithdrawal : driver) {
			if(payType!=null && payType == 2){
			if(payType!=null && payType == 1){
			break;
			}
			WaterVO waterVO = new WaterVO();
			@@ -1202,7 +1238,7 @@
			}
			// 用户提现
			for (TPubWithdrawal tPubWithdrawal : user) {
			if(payType!=null && payType == 2){
			if(payType!=null && payType == 1){
			break;
			}
			WaterVO waterVO = new WaterVO();
			@@ -1226,6 +1262,10 @@
			Integer orderId = tPubTransactionDetail.getOrderId();
			PaymentRecord paymentRecord = paymentRecordService.selectById(orderId);
			if (paymentRecord!=null){
			if (paymentRecord.getState() == 1){
			// 临时数据
			continue;
			}
			waterVO.setInsertTime(format.format(paymentRecord.getInsertTime()));
			waterVO.setCode(paymentRecord.getCode());
			if (paymentRecord.getPayType()!=null){
			@@ -1271,19 +1311,18 @@
			userRecharge = userRecharge.add(new BigDecimal(paymentRecord.getAmount().toString()));
			}
			// 查询所有已结算的订单
			// 查询所有已结算的订单
			for (SettlementDetail income : settlementDetails1) {
			WaterVO platformVO = new WaterVO();
			platformVO.setType("司机结算");
			switch (income.getOrderType()){
			case 1:
			SettlementRecord settlementRecord = settlementRecordService.selectById(income.getSettlementRecordId());
			if (settlementRecord!=null){
			if (settlementRecord!=null && settlementRecord.getPaymentStatus()!=null && settlementRecord.getPaymentStatus() == 2){
			if (settlementRecord.getPayType()!=null){
			switch (settlementRecord.getPayType()){
			case 1:
			if (payType!=null){
			if (payType == 1){
			if (payType != 1){
			continue;
			}
			}
			@@ -1291,7 +1330,7 @@
			break;
			case 2:
			if (payType!=null){
			if (payType == 2){
			if (payType != 2){
			continue;
			}
			}
			@@ -1343,12 +1382,12 @@
			// 小件物流
			// 查询订单信息
			SettlementRecord settlementRecord1 = settlementRecordService.selectById(income.getSettlementRecordId());
			if (settlementRecord1==null){
			if (settlementRecord1.getPayType()!=null){
			if (settlementRecord1!=null){
			if (settlementRecord1.getPaymentStatus()!=null && settlementRecord1.getPaymentStatus() == 2){
			switch (settlementRecord1.getPayType()){
			case 1:
			if (payType!=null){
			if (payType == 1){
			if (payType != 1){
			continue;
			}
			}
			@@ -1356,7 +1395,7 @@
			break;
			case 2:
			if (payType!=null){
			if (payType == 2){
			if (payType != 2){
			continue;
			}
			}
			@@ -1367,7 +1406,11 @@
			continue;
			}

			}else{
			continue;
			}
			}else{
			continue;
			}
			TOrderLogistics tOrderLogistics1 = orderLogisticsService.selectById(income.getOrderId());
			if (tOrderLogistics1==null){
			@@ -1500,7 +1543,8 @@
			.ne("type", 1)
			.isNotNull("orderType"));
			}else{
			if (time == 5 && insertTime==null){

			if (time == 5 && !StringUtils.hasLength(insertTime)){
			incomes = tIncomeService.selectList(new EntityWrapper<Income>()
			.eq("userType", 1)
			.eq("objectId",1)
			@@ -1516,7 +1560,7 @@
			}
			}
			EntityWrapper<SettlementDetail> settlementDetailEntityWrapper = new EntityWrapper<>();
			if (time == 5 && insertTime==null){
			if (time == 5 && !StringUtils.hasLength(insertTime)){

			}else{
			settlementDetailEntityWrapper.between("createTime", start, end);
			@@ -1623,7 +1667,6 @@
			break;
			}
			}

			// 查询所有现金支付的订单
			for (SettlementDetail settlementDetail : settlementDetails) {
			PlatformVO platformVO = new PlatformVO();
			@@ -1640,33 +1683,31 @@
			platformVO.setDriverName(tDriver.getFirstName()+tDriver.getLastName());
			platformVO.setDriverPhone(tDriver.getPhone());
			}

			platformVO.setRemark(tOrderPrivateCar.getRemark());

			platformVO.setInsertTime(format.format(tOrderPrivateCar.getInsertTime()));
			String string = settlementDetail.getPrice().toString();
			BigDecimal bigDecimal1 = new BigDecimal(string);
			platformVO.setMoney(bigDecimal1);
			platformVO.setPayType("现金支付");

			if (settlementDetail.getSettlementRecordId()!=null){
			if (state!=null && state!=1){
			continue;
			}
			// 已结算
			platformVO.setState(1);
			SettlementRecord settlementRecord = settlementRecordService.selectById(settlementDetail.getSettlementRecordId());
			balance = balance.add(new BigDecimal(settlementDetail.getPrice()));
			platformVO.setEndTime(format.format(settlementRecord.getDay()));
			}else{
			if (state!=null && state!=2){
			continue;
			if (settlementRecord.getPaymentStatus()!=null && settlementRecord.getPaymentStatus()==2){
			if (state!=null && state!=1){
			continue;
			}
			// 已结算
			platformVO.setState(1);
			balance = balance.add(new BigDecimal(settlementDetail.getPrice()));
			platformVO.setEndTime(format.format(settlementRecord.getPayTime()));
			}else{
			// 未结算
			if (state!=null && state!=2){
			continue;
			}
			platformVO.setState(2);
			unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
			}
			// 未结算
			platformVO.setState(2);
			unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
			}

			res.add(platformVO);
			break;
			case 4:
			@@ -1689,21 +1730,24 @@
			platformVO.setInsertTime(format.format(tOrderLogistics.getInsertTime()));
			platformVO.setPayType("现金支付");
			if (settlementDetail.getSettlementRecordId()!=null){
			if (state!=null && state!=1){
			continue;
			}
			// 已结算
			platformVO.setState(1);
			SettlementRecord settlementRecord = settlementRecordService.selectById(settlementDetail.getSettlementRecordId());
			balance = balance.add(new BigDecimal(settlementDetail.getPrice()));
			platformVO.setEndTime(format.format(settlementRecord.getDay()));
			}else{
			if (state!=null && state!=2){
			continue;
			if (settlementRecord.getPaymentStatus()!=null && settlementRecord.getPaymentStatus()==2){
			if (state!=null && state!=1){
			continue;
			}
			// 已结算
			platformVO.setState(1);
			balance = balance.add(new BigDecimal(settlementDetail.getPrice()));
			platformVO.setEndTime(format.format(settlementRecord.getDay()));
			}else{
			// 未结算
			if (state!=null && state!=2){
			continue;
			}
			platformVO.setState(2);
			unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
			platformVO.setEndTime(format.format(settlementRecord.getDay()));
			}
			// 未结算
			platformVO.setState(2);
			unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
			}
			res.add(platformVO);
			break;