diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java index 941784c67..b89373ba6 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java @@ -991,7 +991,8 @@ public class PileBasicInfoServiceImpl implements PileBasicInfoService { if (SecurityUtils.getUsername().equals("demo")) { BigDecimal bigDecimal = new BigDecimal(Constants.THREE); log.info("demo账号, begin:{}", JSON.toJSONString(generalInfo)); - generalInfo.setTotalChargingAmount(new BigDecimal(generalInfo.getTotalChargingAmount()).multiply(bigDecimal).toString()); + // generalInfo.setTotalChargingAmount(new BigDecimal(generalInfo.getTotalChargingAmount()).multiply(bigDecimal).toString()); + generalInfo.setTotalChargingAmount(new BigDecimal(generalInfo.getTotalSettleAmount()).multiply(bigDecimal).toString()); generalInfo.setTotalPileQuantity(new BigDecimal(generalInfo.getTotalPileQuantity()).multiply(bigDecimal).toString()); generalInfo.setTotalChargingDegree(new BigDecimal(generalInfo.getTotalChargingDegree()).multiply(bigDecimal).toString()); generalInfo.setTotalChargingQuantity(new BigDecimal(generalInfo.getTotalChargingQuantity()).multiply(bigDecimal).toString()); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/IndexGeneralSituationVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/IndexGeneralSituationVO.java index 0412a5b5e..f30c353d5 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/IndexGeneralSituationVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/IndexGeneralSituationVO.java @@ -20,6 +20,11 @@ public class IndexGeneralSituationVO { */ private String totalChargingAmount; + /** + * 总结算金额 + */ + private String totalSettleAmount; + /** * 总充电笔数 */ diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileBasicInfoMapper.xml index 47c4d8298..a995cfaac 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileBasicInfoMapper.xml @@ -401,6 +401,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"