mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-04-20 11:05:18 +08:00
优化结算订单逻辑
This commit is contained in:
@@ -391,7 +391,8 @@ public abstract class AbstractProgramLogic implements InitializingBean {
|
||||
BigDecimal sumUsedElectricity = sharpUsedElectricity.add(peakUsedElectricity).add(flatUsedElectricity).add(valleyUsedElectricity);
|
||||
// data中的总用电量
|
||||
BigDecimal totalElectricity = new BigDecimal(StringUtils.isBlank(data.getTotalElectricity()) ? Constants.ZERO : data.getTotalElectricity());
|
||||
orderDetail.setTotalUsedElectricity(totalElectricity.max(sumUsedElectricity)); // sumUsedElectricity与totalElectricity对比, 取最大的值
|
||||
// sumUsedElectricity与totalElectricity对比, 取最大的值
|
||||
orderDetail.setTotalUsedElectricity(totalElectricity.max(sumUsedElectricity));
|
||||
// 订单总金额
|
||||
orderDetail.setTotalOrderAmount(orderAmount);
|
||||
} catch (Exception e) {
|
||||
|
||||
Reference in New Issue
Block a user