diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/GuiZhouPlatformServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/GuiZhouPlatformServiceImpl.java index 003a67bf8..c12b34cfa 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/GuiZhouPlatformServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/GuiZhouPlatformServiceImpl.java @@ -841,6 +841,9 @@ public class GuiZhouPlatformServiceImpl implements ThirdPartyPlatformService { PileMerchantInfoVO pileMerchantInfoVO = pileMerchantInfoService.queryMerchantInfoByStationId(String.valueOf(stationInfo.getId())); String organizationCode = pileMerchantInfoVO.getOrganizationCode(); + // 保留两位小数 + stationTotalElectricity= stationTotalElectricity.setScale(2, RoundingMode.HALF_UP); + // 创建对象 String startTime = DateUtils.getYesterdayStr(); String endTime = DateUtils.getYesterdayStr(); @@ -892,6 +895,7 @@ public class GuiZhouPlatformServiceImpl implements ThirdPartyPlatformService { * * @return */ + @Override public String notificationPowerInfo(List stationIds) { List list = new ArrayList<>(); String dateTimeNow = DateUtils.dateTimeNow(DateUtils.YYYY_MM_DD_HH_MM_SS); @@ -1081,6 +1085,8 @@ public class GuiZhouPlatformServiceImpl implements ThirdPartyPlatformService { SupChargeDetails detail; for (BillingPriceVO billingPriceVO : billingList) { detail = new SupChargeDetails(); + //保留2位小数 + BigDecimal detailServiceMoney = orderDetail.getSharpServicePrice().setScale(2, RoundingMode.HALF_UP); if (StringUtils.equals(billingPriceVO.getTimeType(), BillingTimeTypeEnum.SHARP.getValue())) { // 尖时段 detail.setDetailStartTime(DateUtils.getDateTime()); @@ -1089,7 +1095,7 @@ public class GuiZhouPlatformServiceImpl implements ThirdPartyPlatformService { detail.setSevicePrice(new BigDecimal(billingPriceVO.getServicePrice()).setScale(4, BigDecimal.ROUND_HALF_UP)); detail.setDetailPower(orderDetail.getSharpUsedElectricity()); detail.setDetailElecMoney(orderDetail.getSharpElectricityPrice()); - detail.setDetailServiceMoney(orderDetail.getSharpServicePrice()); + detail.setDetailServiceMoney(detailServiceMoney); } else if (StringUtils.equals(billingPriceVO.getTimeType(), BillingTimeTypeEnum.PEAK.getValue())) { // 峰时段 detail.setDetailStartTime(DateUtils.getDateTime()); @@ -1098,7 +1104,7 @@ public class GuiZhouPlatformServiceImpl implements ThirdPartyPlatformService { detail.setSevicePrice(new BigDecimal(billingPriceVO.getServicePrice()).setScale(4, BigDecimal.ROUND_HALF_UP)); detail.setDetailPower(orderDetail.getPeakUsedElectricity()); detail.setDetailElecMoney(orderDetail.getPeakElectricityPrice()); - detail.setDetailServiceMoney(orderDetail.getPeakServicePrice()); + detail.setDetailServiceMoney(detailServiceMoney); } else if (StringUtils.equals(billingPriceVO.getTimeType(), BillingTimeTypeEnum.FLAT.getValue())) { // 平时段 detail.setDetailStartTime(DateUtils.getDateTime()); @@ -1107,7 +1113,7 @@ public class GuiZhouPlatformServiceImpl implements ThirdPartyPlatformService { detail.setSevicePrice(new BigDecimal(billingPriceVO.getServicePrice()).setScale(4, BigDecimal.ROUND_HALF_UP)); detail.setDetailPower(orderDetail.getFlatUsedElectricity()); detail.setDetailElecMoney(orderDetail.getFlatElectricityPrice()); - detail.setDetailServiceMoney(orderDetail.getFlatServicePrice()); + detail.setDetailServiceMoney(detailServiceMoney); } else if (StringUtils.equals(billingPriceVO.getTimeType(), BillingTimeTypeEnum.VALLEY.getValue())) { // 谷时段 detail.setDetailStartTime(DateUtils.getDateTime()); @@ -1116,7 +1122,7 @@ public class GuiZhouPlatformServiceImpl implements ThirdPartyPlatformService { detail.setSevicePrice(new BigDecimal(billingPriceVO.getServicePrice()).setScale(4, BigDecimal.ROUND_HALF_UP)); detail.setDetailPower(orderDetail.getValleyUsedElectricity()); detail.setDetailElecMoney(orderDetail.getValleyElectricityPrice()); - detail.setDetailServiceMoney(orderDetail.getValleyServicePrice()); + detail.setDetailServiceMoney(detailServiceMoney); } resultList.add(detail); }