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

bugfix

Browse Source
This commit is contained in:
Lemon
2024-01-09 17:29:25 +08:00
parent 2764a267ae
commit 136b3a08d8
5 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/xindiantu/XDTController.java vendored
View File

@@ -171,7 +171,7 @@ public class XDTController extends BaseController {
Map<String, String> map = xdtService.queryEquipBusinessPolicy(queryStartChargeDTO); Map<String, String> map = xdtService.queryEquipBusinessPolicy(queryStartChargeDTO);
logger.info("新电途平台查询业务策略信息 result:{}", JSONObject.toJSONString(map)); 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) { } catch (Exception e) {
logger.info("新电途平台查询业务策略信息 error:", e); logger.info("新电途平台查询业务策略信息 error:", e);
e.printStackTrace(); e.printStackTrace();

2
jsowell-common/src/main/java/com/jsowell/common/enums/thirdparty/ThirdPartyOperatorIdEnum.java vendored
View File

@@ -13,7 +13,7 @@ public enum ThirdPartyOperatorIdEnum {
ZHONG_DIAN_LIAN_PLATFORM("2", "14405899X"), ZHONG_DIAN_LIAN_PLATFORM("2", "14405899X"),
JIANG_SU_PLATFORM("3", "726079387"), JIANG_SU_PLATFORM("3", "726079387"),
YONG_CHENG_BO_CHE("4", "330205020"), YONG_CHENG_BO_CHE("4", "330205020"),
XIN_DIAN_TU("6", "MA25CNM38"),
; ;
private String type; private String type;

4
jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryStartChargeDTO.java
View File

@@ -57,4 +57,8 @@ public class QueryStartChargeDTO {
*/ */
@JsonProperty(value = "AccountBalance") @JsonProperty(value = "AccountBalance")
private BigDecimal accountBalance; private BigDecimal accountBalance;
// ----------------- 新电途平台接口拓展字段------------------
private BigDecimal chargingAmt;
} }

3
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/xindiantu/service/impl/XDTServiceImpl.java vendored
View File

@@ -1,6 +1,8 @@
package com.jsowell.thirdparty.xindiantu.service.impl; 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.enums.thirdparty.ThirdPlatformTypeEnum;
import com.jsowell.common.util.StringUtils;
import com.jsowell.pile.domain.ThirdPartyStationRelation; import com.jsowell.pile.domain.ThirdPartyStationRelation;
import com.jsowell.pile.dto.QueryEquipChargeStatusDTO; import com.jsowell.pile.dto.QueryEquipChargeStatusDTO;
import com.jsowell.pile.dto.QueryEquipmentDTO; import com.jsowell.pile.dto.QueryEquipmentDTO;
@@ -106,6 +108,7 @@ public class XDTServiceImpl implements XDTService {
*/ */
@Override @Override
public Map<String, String> queryStartCharge(QueryStartChargeDTO dto) { public Map<String, String> queryStartCharge(QueryStartChargeDTO dto) {
dto.setAccountBalance(dto.getChargingAmt());
return zdlService.queryStartCharge(dto); return zdlService.queryStartCharge(dto);
} }

2
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/service/impl/ZDLServiceImpl.java vendored
View File

@@ -384,7 +384,7 @@ public class ZDLServiceImpl implements ZDLService {
for (BillingPriceVO billingPriceVO : billingPriceVOList) { for (BillingPriceVO billingPriceVO : billingPriceVOList) {
// 将时段开始时间、电费、服务费信息进行封装 // 将时段开始时间、电费、服务费信息进行封装
policyInfo = new EquipBusinessPolicyVO.PolicyInfo(); 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.setElecPrice(new BigDecimal(billingPriceVO.getElectricityPrice()).setScale(4, BigDecimal.ROUND_HALF_UP));
policyInfo.setServicePrice(new BigDecimal(billingPriceVO.getServicePrice()).setScale(4, BigDecimal.ROUND_HALF_UP)); policyInfo.setServicePrice(new BigDecimal(billingPriceVO.getServicePrice()).setScale(4, BigDecimal.ROUND_HALF_UP));