autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-06-11 10:49:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
YAS\29473
2025-10-30 08:43:49 +08:00
parent 82a3080441
commit 4deff12b12
2 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/domain/SupChargeDetails.java vendored
View File

@@ -67,6 +67,18 @@ public class SupChargeDetails {
@JSONField(name = "SevicePrice") @JSONField(name = "SevicePrice")
private BigDecimal sevicePrice; private BigDecimal sevicePrice;
/**
* 时段服务费价格
* SevicePrice
* 时段服务费价格，单位：元，小数点后4位
* 否
* 浮点数
* ≤8字符，小数点后4位
*/
@JSONField(name = "ServicePrice")
private BigDecimal servicePrice;
/** /**
* 时段电费 * 时段电费
* DetailElecMoney * DetailElecMoney

23
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/GuiZhouPlatformServiceImpl.java vendored
View File

@@ -1087,14 +1087,18 @@ public class GuiZhouPlatformServiceImpl implements ThirdPartyPlatformService {
detail = new SupChargeDetails(); detail = new SupChargeDetails();
//保留2位小数 //保留2位小数
BigDecimal detailServiceMoney = orderDetail.getSharpServicePrice().setScale(2, RoundingMode.HALF_UP); 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())) { if (StringUtils.equals(billingPriceVO.getTimeType(), BillingTimeTypeEnum.SHARP.getValue())) {
// 尖时段 // 尖时段
detail.setDetailStartTime(DateUtils.getDateTime()); detail.setDetailStartTime(DateUtils.getDateTime());
detail.setDetailEndTime(DateUtils.getDateTime()); detail.setDetailEndTime(DateUtils.getDateTime());
detail.setElecPrice(new BigDecimal(billingPriceVO.getElectricityPrice()).setScale(4, BigDecimal.ROUND_HALF_UP)); 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.setSevicePrice(new BigDecimal(billingPriceVO.getServicePrice()).setScale(4, BigDecimal.ROUND_HALF_UP));
detail.setDetailPower(orderDetail.getSharpUsedElectricity()); detail.setServicePrice(new BigDecimal(billingPriceVO.getServicePrice()).setScale(4, BigDecimal.ROUND_HALF_UP));
detail.setDetailElecMoney(orderDetail.getSharpElectricityPrice()); detail.setDetailPower(detailPower);
detail.setDetailElecMoney(detailElecMoney);
detail.setDetailServiceMoney(detailServiceMoney); detail.setDetailServiceMoney(detailServiceMoney);
} else if (StringUtils.equals(billingPriceVO.getTimeType(), BillingTimeTypeEnum.PEAK.getValue())) { } else if (StringUtils.equals(billingPriceVO.getTimeType(), BillingTimeTypeEnum.PEAK.getValue())) {
// 峰时段 // 峰时段
@@ -1102,8 +1106,9 @@ public class GuiZhouPlatformServiceImpl implements ThirdPartyPlatformService {
detail.setDetailEndTime(DateUtils.getDateTime()); detail.setDetailEndTime(DateUtils.getDateTime());
detail.setElecPrice(new BigDecimal(billingPriceVO.getElectricityPrice()).setScale(4, BigDecimal.ROUND_HALF_UP)); 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.setSevicePrice(new BigDecimal(billingPriceVO.getServicePrice()).setScale(4, BigDecimal.ROUND_HALF_UP));
detail.setDetailPower(orderDetail.getPeakUsedElectricity()); detail.setServicePrice(new BigDecimal(billingPriceVO.getServicePrice()).setScale(4, BigDecimal.ROUND_HALF_UP));
detail.setDetailElecMoney(orderDetail.getPeakElectricityPrice()); detail.setDetailPower(detailPower);
detail.setDetailElecMoney(detailElecMoney);
detail.setDetailServiceMoney(detailServiceMoney); detail.setDetailServiceMoney(detailServiceMoney);
} else if (StringUtils.equals(billingPriceVO.getTimeType(), BillingTimeTypeEnum.FLAT.getValue())) { } else if (StringUtils.equals(billingPriceVO.getTimeType(), BillingTimeTypeEnum.FLAT.getValue())) {
// 平时段 // 平时段
@@ -1111,8 +1116,9 @@ public class GuiZhouPlatformServiceImpl implements ThirdPartyPlatformService {
detail.setDetailEndTime(DateUtils.getDateTime()); detail.setDetailEndTime(DateUtils.getDateTime());
detail.setElecPrice(new BigDecimal(billingPriceVO.getElectricityPrice()).setScale(4, BigDecimal.ROUND_HALF_UP)); 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.setSevicePrice(new BigDecimal(billingPriceVO.getServicePrice()).setScale(4, BigDecimal.ROUND_HALF_UP));
detail.setDetailPower(orderDetail.getFlatUsedElectricity()); detail.setServicePrice(new BigDecimal(billingPriceVO.getServicePrice()).setScale(4, BigDecimal.ROUND_HALF_UP));
detail.setDetailElecMoney(orderDetail.getFlatElectricityPrice()); detail.setDetailPower(detailPower);
detail.setDetailElecMoney(detailElecMoney);
detail.setDetailServiceMoney(detailServiceMoney); detail.setDetailServiceMoney(detailServiceMoney);
} else if (StringUtils.equals(billingPriceVO.getTimeType(), BillingTimeTypeEnum.VALLEY.getValue())) { } else if (StringUtils.equals(billingPriceVO.getTimeType(), BillingTimeTypeEnum.VALLEY.getValue())) {
// 谷时段 // 谷时段
@@ -1120,8 +1126,9 @@ public class GuiZhouPlatformServiceImpl implements ThirdPartyPlatformService {
detail.setDetailEndTime(DateUtils.getDateTime()); detail.setDetailEndTime(DateUtils.getDateTime());
detail.setElecPrice(new BigDecimal(billingPriceVO.getElectricityPrice()).setScale(4, BigDecimal.ROUND_HALF_UP)); 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.setSevicePrice(new BigDecimal(billingPriceVO.getServicePrice()).setScale(4, BigDecimal.ROUND_HALF_UP));
detail.setDetailPower(orderDetail.getValleyUsedElectricity()); detail.setServicePrice(new BigDecimal(billingPriceVO.getServicePrice()).setScale(4, BigDecimal.ROUND_HALF_UP));
detail.setDetailElecMoney(orderDetail.getValleyElectricityPrice()); detail.setDetailPower(detailPower);
detail.setDetailElecMoney(detailElecMoney);
detail.setDetailServiceMoney(detailServiceMoney); detail.setDetailServiceMoney(detailServiceMoney);
} }
resultList.add(detail); resultList.add(detail);