java/IgoTravel.git

			@@ -100,6 +100,9 @@

			@Autowired
			private ISettlementRecordService settlementRecordService;

			@Resource
			private IBalanceUsageRecordService balanceUsageRecordService;



			@@ -1088,7 +1091,7 @@

			for(OrderPrivateCar order : orderList){
			if(order.getSmsTime()==null ){
			if(order.getGetoffTime().getTime()+246060*1000L<day.getTime()){
			if(null != order.getGetoffTime() && order.getGetoffTime().getTime()+246060*1000L<day.getTime()){
			order.setSmsNumber(order.getSmsNumber()+1);
			order.setSmsTime(day);
			//发送短信
			@@ -1207,14 +1210,18 @@
			}
			if(payType == 3){//余额支付
			driver.setBalance(driver.getBalance() - money);
			if(driver.getLaveBusinessMoney().compareTo(money) < 0){
			double b = money - driver.getLaveBusinessMoney();
			Double laveBusinessMoney = driver.getLaveBusinessMoney();
			if(laveBusinessMoney.compareTo(money) < 0){
			double b = money - laveBusinessMoney;
			driver.setLaveBusinessMoney(0D);
			driver.setLaveActivityMoney(driver.getLaveActivityMoney() - b);
			driverService.updateById(driver);
			balanceUsageRecordService.saveBalanceUsageRecord(driver.getId(), 1, b, orderType == 1 ? 1 : 2);
			balanceUsageRecordService.saveBalanceUsageRecord(driver.getId(), 2, laveBusinessMoney, orderType == 1 ? 1 : 2);
			}else{
			driver.setLaveBusinessMoney(driver.getLaveBusinessMoney() - money);
			driverService.updateById(driver);
			balanceUsageRecordService.saveBalanceUsageRecord(driver.getId(), 2, money, orderType == 1 ? 1 : 2);
			}

			if(orderType == 1){//专车