diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java index f72681767..fb6ed0836 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java @@ -441,7 +441,9 @@ public class CommonService { dto.setPileConnectorCode(pileConnectorCode); dto.setPlatformType(thirdPartySecretInfoVO.getPlatformType()); - if(thirdPartySecretInfoVO.getPlatformType().equals(ThirdPlatformTypeEnum.CHANG_ZHOU_PLATFORM.getTypeCode())){ + if(thirdPartySecretInfoVO.getPlatformType().equals(ThirdPlatformTypeEnum.CHANG_ZHOU_PLATFORM.getTypeCode())|| + thirdPartySecretInfoVO.getPlatformType().equals(ThirdPlatformTypeEnum.JI_LIN_PLATFORM.getTypeCode()) + ){ //专门处理常畅充平台转换枪口状态 if (StringUtils.equals(connectorStatus, PileConnectorStatusEnum.FREE.getValue())) { if(StringUtils.equals(realTimeMonitorData.getPutGunType(), "01")){ diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/vo/QueryChargingStatusVO.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/vo/QueryChargingStatusVO.java index 3c01d985a..9f097bf78 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/vo/QueryChargingStatusVO.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/vo/QueryChargingStatusVO.java @@ -123,12 +123,30 @@ public class QueryChargingStatusVO { @JSONField(name = "SeviceMoney") private BigDecimal seviceMoney; + /** + * 累计服务费 + */ + @JSONField(name = "ServiceMoney") + private BigDecimal serviceMoney; + /** * 累计总金额 */ @JSONField(name = "TotalMoney") private BigDecimal totalMoney; + /** + * 充电设施运营商和 客户运营商协议电 价计费。无协议电 价,则填写为累计 电费。 + */ + @JSONField(name = "DiscountElecMoney") + private BigDecimal discountElecMoney; + + /** + * 累计协议服务费 + */ + @JSONField(name = "DiscountServiceMoney") + private BigDecimal discountServiceMoney; + /** * 是否可申请停车费减免 */ 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 12cc5a332..1396d7271 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 @@ -711,7 +711,7 @@ public class JiLinPlatformServiceImpl implements ThirdPartyPlatformService { dto.setStartChargeSeq(orderNO); //查询充电桩枪口信息 - PileConnectorInfoVO connectorInfo = pileConnectorInfoService.getPileConnectorInfoByConnectorCode(orderNO); + PileConnectorInfoVO connectorInfo = pileConnectorInfoService.getPileConnectorInfoByConnectorCode(dto.getConnectorID()); if (Objects.isNull(connectorInfo) || connectorInfo.getStatus() == 255) { failReasonCode = 1; //此设备不存在(设备已下线或站 点非正常使用状态时,认为设备不存在) succStat = 1; @@ -971,6 +971,8 @@ public class JiLinPlatformServiceImpl implements ThirdPartyPlatformService { // 拼装联联平台数据 vo = QueryChargingStatusVO.builder() + .stationID(info.getStationId()) + .equipmentID(info.getPileSn()) .orderNo(orderInfo.getOrderCode()) //订单号 .succStat(0) // 成功状态 .orderStatus(Integer.parseInt(orderStatus)) // 订单状态 @@ -983,8 +985,11 @@ public class JiLinPlatformServiceImpl implements ThirdPartyPlatformService { .endTime(DateUtils.getDateTime()) // 本次采样时间 .totalPower(new BigDecimal(data.getChargingDegree()).setScale(4, BigDecimal.ROUND_HALF_UP)) // 累计充电量 .elecMoney(totalElectricityAmount.setScale(2, BigDecimal.ROUND_HALF_UP)) // 累计电费 - .seviceMoney(totalServiceAmount.setScale(2, BigDecimal.ROUND_HALF_UP)) // 累计服务费 + .serviceMoney(totalServiceAmount.setScale(2, BigDecimal.ROUND_HALF_UP)) // 累计服务费 .totalMoney(new BigDecimal(data.getChargingAmount()).setScale(2, BigDecimal.ROUND_HALF_UP)) // 已充金额 + .pushTimeStamp(DateUtils.getDateTime()) + .discountElecMoney(totalElectricityAmount.setScale(2, BigDecimal.ROUND_HALF_UP)) + .discountServiceMoney(totalServiceAmount.setScale(2, BigDecimal.ROUND_HALF_UP)) .build(); } String url = urlAddress + BusinessInformationExchangeEnum.NOTIFICATION_EQUIP_CHARGE_STATUS.getValue();