java/YueKeDuo.git

			@@ -2614,7 +2614,6 @@

			private boolean isPrivateCarPrepayFinalStage(OrderPrivateCar orderPrivateCar) {
			return orderPrivateCar != null
			&& Integer.valueOf(1).equals(orderPrivateCar.getPaymentMode())
			&& !Integer.valueOf(5).equals(orderPrivateCar.getPrepayStage());
			}

			@@ -2638,7 +2637,7 @@
			if (paymentRecord != null && paymentRecord.getAmount() != null && paymentRecord.getAmount() > 0) {
			return toMoney(paymentRecord.getAmount());
			}
			if (orderPrivateCar.getPayMoney() != null && orderPrivateCar.getPayMoney() > 0) {
			if (Integer.valueOf(1).equals(orderPrivateCar.getPaymentMode()) && orderPrivateCar.getPayMoney() != null && orderPrivateCar.getPayMoney() > 0) {
			return toMoney(orderPrivateCar.getPayMoney());
			}
			return BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP);

			@@ -2112,7 +2112,6 @@

			private boolean isTaxiPrepayFinalStage(OrderTaxi orderTaxi) {
			return orderTaxi != null
			&& Integer.valueOf(1).equals(orderTaxi.getPaymentMode())
			&& !Integer.valueOf(5).equals(orderTaxi.getPrepayStage());
			}

			@@ -2136,7 +2135,7 @@
			if (paymentRecord != null && paymentRecord.getAmount() != null && paymentRecord.getAmount() > 0) {
			return toMoney(paymentRecord.getAmount());
			}
			if (orderTaxi.getPayMoney() != null && orderTaxi.getPayMoney() > 0) {
			if (Integer.valueOf(1).equals(orderTaxi.getPaymentMode()) && orderTaxi.getPayMoney() != null && orderTaxi.getPayMoney() > 0) {
			return toMoney(orderTaxi.getPayMoney());
			}
			return BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP);

	UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史