java/XianNingChuXing.git

			@@ -12,10 +12,7 @@
			import com.stylefeng.guns.modular.system.dao.TUseMoneyMapper;
			import com.stylefeng.guns.modular.system.model.*;
			import com.stylefeng.guns.modular.system.service.*;
			import com.stylefeng.guns.modular.system.util.PayMoneyUtil;
			import com.stylefeng.guns.modular.system.util.PushUtil;
			import com.stylefeng.guns.modular.system.util.ResultUtil;
			import com.stylefeng.guns.modular.system.util.UUIDUtil;
			import com.stylefeng.guns.modular.system.util.*;
			import com.stylefeng.guns.modular.system.warpper.BaseWarpper;
			import com.stylefeng.guns.modular.taxi.model.OrderTaxi;
			import com.stylefeng.guns.modular.taxi.service.IOrderTaxiService;
			@@ -266,6 +263,7 @@
			}
			eq.orderBy("insertTime",false);
			List<TransactionDetails> transactionDetails = iTransactionDetailsService.selectList(eq);
			List<OrderTaxi> orderTaxis = orderTaxiService.selectList(null);
			if ((state!=null&&state==1)\|\|(state!=null&&state==2)){
			List<HistoryVo> historyVos = new ArrayList<>();
			for (TransactionDetails transactionDetail : transactionDetails) {
			@@ -281,6 +279,12 @@
			}
			historyVo.setAddordown(1);
			}else {
			OrderTaxi orderTaxi = orderTaxis.stream().filter(e -> e.getId().equals(transactionDetail.getOrderId())).findFirst().orElse(null);
			if (orderTaxi!=null){
			if (orderTaxi.getPayType()!=null && (orderTaxi.getPayType()!=1\|\|orderTaxi.getPayType()!=2)){
			continue;
			}
			}
			historyVo.setState("扣除");
			historyVo.setAddordown(0);
			}
			@@ -313,6 +317,12 @@
			}
			historyVo.setAddordown(1);
			}else {
			OrderTaxi orderTaxi = orderTaxis.stream().filter(e -> e.getId().equals(transactionDetail.getOrderId())).findFirst().orElse(null);
			if (orderTaxi!=null){
			if (orderTaxi.getPayType()!=null && (orderTaxi.getPayType()!=1\|\|orderTaxi.getPayType()!=2)){
			continue;
			}
			}
			historyVo.setState("扣除");
			historyVo.setAddordown(0);
			}