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

View File

@@ -171,7 +171,7 @@ public class XDTController extends BaseController {
Map<String, String> 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();

View File

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

View File

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

View File

@@ -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<String, String> queryStartCharge(QueryStartChargeDTO dto) {
dto.setAccountBalance(dto.getChargingAmt());
return zdlService.queryStartCharge(dto);
}

View File

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