java/IgoTravel.git

			@@ -136,6 +136,7 @@
			orderStatusWarpper.setOrderId(orderPrivateCar.getId());
			orderStatusWarpper.setOrderType(1);
			orderStatusWarpper.setState(orderPrivateCar.getState());
			orderStatusWarpper.setTripId(orderPrivateCar.getTripId());
			data.add(orderStatusWarpper);
			}
			List<OrderTaxi> list = orderTaxiService.queryOrder(uid, 1, 2, 3, 4, 5, 6, 7, 11, 12);
			@@ -147,6 +148,7 @@
			orderStatusWarpper.setOrderId(orderTaxi.getId());
			orderStatusWarpper.setOrderType(2);
			orderStatusWarpper.setState(orderTaxi.getState());
			// orderStatusWarpper.setTripId(orderTaxi.getTripId());
			data.add(orderStatusWarpper);
			}
			List<OrderCrossCity> orderCrossCities = orderCrossCityService.queryOrder(uid, 1, 2, 3, 4, 5, 6, 7, 11, 12);
			@@ -158,6 +160,7 @@
			orderStatusWarpper.setOrderId(orderCrossCity.getId());
			orderStatusWarpper.setOrderType(3);
			orderStatusWarpper.setState(orderCrossCity.getState());
			// orderStatusWarpper.setTripId(orderPrivateCar.getTripId());
			data.add(orderStatusWarpper);
			}
			return ResultUtil.success(data);
			@@ -1045,9 +1048,12 @@
			return ResultUtil.tokenErr();
			}
			Map<String, Object> map = new HashMap<>();
			Double payMoney = 0D;
			switch (orderType){
			case 1:
			map = orderPrivateCarService.queryBalance(orderId, uid);
			OrderPrivateCar orderPrivateCar = orderPrivateCarService.selectById(orderId);
			payMoney = orderPrivateCar.getPayMoney();
			break;
			// case 2:
			// map = orderTaxiService.queryBalance(orderId, uid);
			@@ -1057,11 +1063,22 @@
			// break;
			case 4:
			map = orderLogisticsService.queryBalance(orderId, uid);
			OrderLogistics orderLogistics = orderLogisticsService.selectById(orderId);
			payMoney = orderLogistics.getPayMoney();
			break;
			// case 5:
			// map = orderLogisticsService.queryBalance(orderId, uid);
			// break;
			}
			Double aDouble = userRedPacketRecordService.queryRemainingAmount(uid);
			map.put("redTotal", aDouble);
			RedEnvelopePaymentSettings redEnvelopePaymentSettings = redEnvelopePaymentSettingsService.getRedEnvelopePaymentSettings();
			if(null == redEnvelopePaymentSettings){
			map.put("deductionAmount", 0D);
			}else{
			Double deductionAmount = new BigDecimal(payMoney).multiply(redEnvelopePaymentSettings.getDeductionRatio().divide(new BigDecimal(100))).doubleValue();
			map.put("deductionAmount", deductionAmount);
			}
			return ResultUtil.success(map);
			}catch (Exception e){
			e.printStackTrace();