diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/xindiantu/XDTController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/xindiantu/XDTController.java index 2d4e9704a..a9288c19f 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/xindiantu/XDTController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/xindiantu/XDTController.java @@ -171,7 +171,7 @@ public class XDTController extends BaseController { Map map = xdtService.queryEquipBusinessPolicy(queryStartChargeDTO); logger.info("新电途平台查询业务策略信息 result:{}", JSONObject.toJSONString(map)); - return CommonResult.success(0, "查询业务策略信息!", map.get("Data"), map.get("Sig")); + return CommonResult.success(0, "查询业务策略信息成功!", map.get("Data"), map.get("Sig")); } catch (Exception e) { logger.info("新电途平台查询业务策略信息 error:", e); e.printStackTrace(); diff --git a/jsowell-common/src/main/java/com/jsowell/common/enums/thirdparty/ThirdPartyOperatorIdEnum.java b/jsowell-common/src/main/java/com/jsowell/common/enums/thirdparty/ThirdPartyOperatorIdEnum.java index 012a0058e..7a58f8bd4 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/enums/thirdparty/ThirdPartyOperatorIdEnum.java +++ b/jsowell-common/src/main/java/com/jsowell/common/enums/thirdparty/ThirdPartyOperatorIdEnum.java @@ -13,7 +13,7 @@ public enum ThirdPartyOperatorIdEnum { ZHONG_DIAN_LIAN_PLATFORM("2", "14405899X"), JIANG_SU_PLATFORM("3", "726079387"), YONG_CHENG_BO_CHE("4", "330205020"), - + XIN_DIAN_TU("6", "MA25CNM38"), ; private String type; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryStartChargeDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryStartChargeDTO.java index 3ec44b457..838384da9 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryStartChargeDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryStartChargeDTO.java @@ -57,4 +57,8 @@ public class QueryStartChargeDTO { */ @JsonProperty(value = "AccountBalance") private BigDecimal accountBalance; + + + // ----------------- 新电途平台接口拓展字段------------------ + private BigDecimal chargingAmt; } diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/xindiantu/service/impl/XDTServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/xindiantu/service/impl/XDTServiceImpl.java index 9a56b8fc1..f69fcd13b 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/xindiantu/service/impl/XDTServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/xindiantu/service/impl/XDTServiceImpl.java @@ -1,6 +1,8 @@ package com.jsowell.thirdparty.xindiantu.service.impl; +import com.jsowell.common.enums.thirdparty.ThirdPartyOperatorIdEnum; import com.jsowell.common.enums.thirdparty.ThirdPlatformTypeEnum; +import com.jsowell.common.util.StringUtils; import com.jsowell.pile.domain.ThirdPartyStationRelation; import com.jsowell.pile.dto.QueryEquipChargeStatusDTO; import com.jsowell.pile.dto.QueryEquipmentDTO; @@ -106,6 +108,7 @@ public class XDTServiceImpl implements XDTService { */ @Override public Map queryStartCharge(QueryStartChargeDTO dto) { + dto.setAccountBalance(dto.getChargingAmt()); return zdlService.queryStartCharge(dto); } diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/service/impl/ZDLServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/service/impl/ZDLServiceImpl.java index 0a8121045..cf1d4ba0b 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/service/impl/ZDLServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/service/impl/ZDLServiceImpl.java @@ -384,7 +384,7 @@ public class ZDLServiceImpl implements ZDLService { for (BillingPriceVO billingPriceVO : billingPriceVOList) { // 将时段开始时间、电费、服务费信息进行封装 policyInfo = new EquipBusinessPolicyVO.PolicyInfo(); - policyInfo.setStartTime(billingPriceVO.getStartTime()); + policyInfo.setStartTime(billingPriceVO.getStartTime() + ":00"); policyInfo.setElecPrice(new BigDecimal(billingPriceVO.getElectricityPrice()).setScale(4, BigDecimal.ROUND_HALF_UP)); policyInfo.setServicePrice(new BigDecimal(billingPriceVO.getServicePrice()).setScale(4, BigDecimal.ROUND_HALF_UP));