java/mx_charging_pile.git

			@@ -1345,8 +1345,10 @@
			}
			BigDecimal electricPrice = snapshot.getElectrovalence() == null ? BigDecimal.ZERO : snapshot.getElectrovalence();
			BigDecimal servicePrice = snapshot.getServiceCharge() == null ? BigDecimal.ZERO : snapshot.getServiceCharge();
			BigDecimal originalServicePrice = snapshot.getCostServiceCharge() == null
			? BigDecimal.ZERO : snapshot.getCostServiceCharge();
			// 原价服务费口径对齐 CD：优惠前原价取策略服务费(service_charge)，而非成本服务费(cost_service_charge)
			BigDecimal originalServicePrice = servicePrice;
			// 成本服务费(cost_service_charge)仅作为原价服务费参考字段透传，与 CD 结算口径一致
			BigDecimal costServiceCharge = snapshot.getCostServiceCharge();
			// 原价金额（策略单价），优惠金额 = 原价 - 最终
			BigDecimal originalElectricAmount = capacity.multiply(electricPrice).setScale(2, BigDecimal.ROUND_HALF_UP);
			BigDecimal originalServiceAmount = capacity.multiply(originalServicePrice).setScale(2, BigDecimal.ROUND_HALF_UP);
			@@ -1385,7 +1387,7 @@
			detail.setType(snapshot.getType());
			detail.setElectrovalence(finalElectricPrice);
			detail.setServiceCharge(finalServicePrice);
			detail.setCostServiceCharge(originalServicePrice);
			detail.setCostServiceCharge(costServiceCharge);
			detail.setChargingCapacity(capacity);
			detail.setPeriodElectricPrice(electricAmount);
			detail.setPeriodServicePrice(serviceAmount);

			@@ -1588,8 +1588,10 @@
			}
			BigDecimal electricPrice = snapshot.getElectrovalence() == null ? BigDecimal.ZERO : snapshot.getElectrovalence();
			BigDecimal servicePrice = snapshot.getServiceCharge() == null ? BigDecimal.ZERO : snapshot.getServiceCharge();
			BigDecimal originalServicePrice = snapshot.getCostServiceCharge() == null
			? BigDecimal.ZERO : snapshot.getCostServiceCharge();
			// 原价服务费口径对齐 CD：优惠前原价取策略服务费(service_charge)，而非成本服务费(cost_service_charge)
			BigDecimal originalServicePrice = servicePrice;
			// 成本服务费(cost_service_charge)仅作为原价服务费参考字段透传，与 CD 结算口径一致
			BigDecimal costServiceCharge = snapshot.getCostServiceCharge();
			// 原价金额（策略单价），优惠金额 = 原价 - 最终
			BigDecimal originalElectricAmount = capacity.multiply(electricPrice).setScale(2, BigDecimal.ROUND_HALF_UP);
			BigDecimal originalServiceAmount = capacity.multiply(originalServicePrice).setScale(2, BigDecimal.ROUND_HALF_UP);
			@@ -1627,7 +1629,7 @@
			detail.setType(snapshot.getType());
			detail.setElectrovalence(finalElectricPrice);
			detail.setServiceCharge(finalServicePrice);
			detail.setCostServiceCharge(originalServicePrice);
			detail.setCostServiceCharge(costServiceCharge);
			detail.setChargingCapacity(capacity);
			detail.setPeriodElectricPrice(electricAmount);
			detail.setPeriodServicePrice(serviceAmount);

	ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TCardChargingOrderServiceImpl.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TVinChargingOrderServiceImpl.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史