diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/zdl/EquipBusinessPolicyVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/zdl/EquipBusinessPolicyVO.java index 699fde1e8..7c0d5eaba 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/zdl/EquipBusinessPolicyVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/zdl/EquipBusinessPolicyVO.java @@ -1,5 +1,6 @@ package com.jsowell.pile.vo.zdl; +import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; import lombok.Builder; @@ -82,5 +83,16 @@ public class EquipBusinessPolicyVO { */ @JsonProperty(value = "SevicePrice") private BigDecimal servicePrice; + + /** + * 单位:元/度,小数点后 4 位。 基础设施运营商和客户运营商协议电 价。无协议电价,则填写基础电费价 格 + */ + @JSONField(name = "DiscountElecPrice") + private BigDecimal discountElecPrice; + + + @JSONField(name = "DiscountServicePrice") + private BigDecimal discountServicePrice; + } } diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/JiLinPlatformServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/JiLinPlatformServiceImpl.java index d41a943f6..3d19a51d1 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/JiLinPlatformServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/JiLinPlatformServiceImpl.java @@ -378,10 +378,10 @@ public class JiLinPlatformServiceImpl implements ThirdPartyPlatformService { .roundTheClock(Constants.one)//7*24小时营业 0:否 1:是 .parkType(255)//0:免费 1:不免费 2:限时免费停车 3:充电限时减免 255:参考场地实际收费标准 .electricityType(Constants.one) //1:商业用电 2:普通工业用电 3:大工业用电 4:其他用电 - .businessExpandType(Constants.one) + .businessExpandType(Integer.valueOf(pileStationInfo.getAloneApply())) .videoMonitor(Constants.zero) - .equipmentOwnerName("通榆县公路客运总站(通榆县开通客运服务有限公司)") - .supplyType(Constants.one) +// .equipmentOwnerName("通榆县公路客运总站(通榆县开通客运服务有限公司)") +// .supplyType(Constants.one) .build(); // 报装电源容量 @@ -673,7 +673,8 @@ public class JiLinPlatformServiceImpl implements ThirdPartyPlatformService { policyInfo.setStartTime(replace); policyInfo.setElecPrice(new BigDecimal(billingPriceVO.getElectricityPrice()).setScale(4, BigDecimal.ROUND_HALF_UP)); policyInfo.setServicePrice(new BigDecimal(billingPriceVO.getServicePrice()).setScale(4, BigDecimal.ROUND_HALF_UP)); - + policyInfo.setDiscountElecPrice(new BigDecimal(billingPriceVO.getElectricityPrice()).setScale(4, BigDecimal.ROUND_HALF_UP)); + policyInfo.setDiscountServicePrice(new BigDecimal(billingPriceVO.getServicePrice()).setScale(4, BigDecimal.ROUND_HALF_UP)); policyInfoList.add(policyInfo); } @@ -1716,6 +1717,8 @@ public class JiLinPlatformServiceImpl implements ThirdPartyPlatformService { chargeOrderInfo.setConnectorID(orderBasicInfo.getPileConnectorCode()); chargeOrderInfo.setStartSoc(startSoc.setScale(1, BigDecimal.ROUND_HALF_UP)); chargeOrderInfo.setEndSoc(endSoc.setScale(1, BigDecimal.ROUND_HALF_UP)); + chargeOrderInfo.setStartTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, orderBasicInfo.getChargeStartTime())); + chargeOrderInfo.setEndTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, orderBasicInfo.getChargeEndTime())); // 累计充电量 chargeOrderInfo.setTotalPower(orderDetail.getTotalUsedElectricity().setScale(4, BigDecimal.ROUND_HALF_UP)); chargeOrderInfo.setPushTimeStamp(DateUtils.getDateTime()); // 推送时间戳