diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/domain/SupChargeDetails.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/domain/SupChargeDetails.java index 855326a89..8d525a447 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/domain/SupChargeDetails.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/domain/SupChargeDetails.java @@ -67,6 +67,18 @@ public class SupChargeDetails { @JSONField(name = "SevicePrice") private BigDecimal sevicePrice; + + /** + * 时段服务费价格 + * SevicePrice + * 时段服务费价格,单位:元,小数点后4位 + * 否 + * 浮点数 + * ≤8字符,小数点后4位 + */ + @JSONField(name = "ServicePrice") + private BigDecimal servicePrice; + /** * 时段电费 * DetailElecMoney 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 c12b34cfa..2dc6b5fce 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 @@ -1087,14 +1087,18 @@ public class GuiZhouPlatformServiceImpl implements ThirdPartyPlatformService { detail = new SupChargeDetails(); //保留2位小数 BigDecimal detailServiceMoney = orderDetail.getSharpServicePrice().setScale(2, RoundingMode.HALF_UP); + BigDecimal detailElecMoney = orderDetail.getSharpElectricityPrice().setScale(2, RoundingMode.HALF_UP); + BigDecimal detailPower = orderDetail.getSharpUsedElectricity().setScale(4, RoundingMode.HALF_UP); + if (StringUtils.equals(billingPriceVO.getTimeType(), BillingTimeTypeEnum.SHARP.getValue())) { // 尖时段 detail.setDetailStartTime(DateUtils.getDateTime()); detail.setDetailEndTime(DateUtils.getDateTime()); detail.setElecPrice(new BigDecimal(billingPriceVO.getElectricityPrice()).setScale(4, BigDecimal.ROUND_HALF_UP)); detail.setSevicePrice(new BigDecimal(billingPriceVO.getServicePrice()).setScale(4, BigDecimal.ROUND_HALF_UP)); - detail.setDetailPower(orderDetail.getSharpUsedElectricity()); - detail.setDetailElecMoney(orderDetail.getSharpElectricityPrice()); + detail.setServicePrice(new BigDecimal(billingPriceVO.getServicePrice()).setScale(4, BigDecimal.ROUND_HALF_UP)); + detail.setDetailPower(detailPower); + detail.setDetailElecMoney(detailElecMoney); detail.setDetailServiceMoney(detailServiceMoney); } else if (StringUtils.equals(billingPriceVO.getTimeType(), BillingTimeTypeEnum.PEAK.getValue())) { // 峰时段 @@ -1102,8 +1106,9 @@ public class GuiZhouPlatformServiceImpl implements ThirdPartyPlatformService { detail.setDetailEndTime(DateUtils.getDateTime()); detail.setElecPrice(new BigDecimal(billingPriceVO.getElectricityPrice()).setScale(4, BigDecimal.ROUND_HALF_UP)); detail.setSevicePrice(new BigDecimal(billingPriceVO.getServicePrice()).setScale(4, BigDecimal.ROUND_HALF_UP)); - detail.setDetailPower(orderDetail.getPeakUsedElectricity()); - detail.setDetailElecMoney(orderDetail.getPeakElectricityPrice()); + detail.setServicePrice(new BigDecimal(billingPriceVO.getServicePrice()).setScale(4, BigDecimal.ROUND_HALF_UP)); + detail.setDetailPower(detailPower); + detail.setDetailElecMoney(detailElecMoney); detail.setDetailServiceMoney(detailServiceMoney); } else if (StringUtils.equals(billingPriceVO.getTimeType(), BillingTimeTypeEnum.FLAT.getValue())) { // 平时段 @@ -1111,8 +1116,9 @@ public class GuiZhouPlatformServiceImpl implements ThirdPartyPlatformService { detail.setDetailEndTime(DateUtils.getDateTime()); detail.setElecPrice(new BigDecimal(billingPriceVO.getElectricityPrice()).setScale(4, BigDecimal.ROUND_HALF_UP)); detail.setSevicePrice(new BigDecimal(billingPriceVO.getServicePrice()).setScale(4, BigDecimal.ROUND_HALF_UP)); - detail.setDetailPower(orderDetail.getFlatUsedElectricity()); - detail.setDetailElecMoney(orderDetail.getFlatElectricityPrice()); + detail.setServicePrice(new BigDecimal(billingPriceVO.getServicePrice()).setScale(4, BigDecimal.ROUND_HALF_UP)); + detail.setDetailPower(detailPower); + detail.setDetailElecMoney(detailElecMoney); detail.setDetailServiceMoney(detailServiceMoney); } else if (StringUtils.equals(billingPriceVO.getTimeType(), BillingTimeTypeEnum.VALLEY.getValue())) { // 谷时段 @@ -1120,8 +1126,9 @@ public class GuiZhouPlatformServiceImpl implements ThirdPartyPlatformService { detail.setDetailEndTime(DateUtils.getDateTime()); detail.setElecPrice(new BigDecimal(billingPriceVO.getElectricityPrice()).setScale(4, BigDecimal.ROUND_HALF_UP)); detail.setSevicePrice(new BigDecimal(billingPriceVO.getServicePrice()).setScale(4, BigDecimal.ROUND_HALF_UP)); - detail.setDetailPower(orderDetail.getValleyUsedElectricity()); - detail.setDetailElecMoney(orderDetail.getValleyElectricityPrice()); + detail.setServicePrice(new BigDecimal(billingPriceVO.getServicePrice()).setScale(4, BigDecimal.ROUND_HALF_UP)); + detail.setDetailPower(detailPower); + detail.setDetailElecMoney(detailElecMoney); detail.setDetailServiceMoney(detailServiceMoney); } resultList.add(detail);