This commit is contained in:
YAS\29473
2025-08-13 14:16:30 +08:00
parent a1bdca4962
commit 0f32629b22
2 changed files with 19 additions and 4 deletions

View File

@@ -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;
}
}

View File

@@ -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()); // 推送时间戳