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

bugfix 华为启动充电不再重复生成订单

Browse Source
This commit is contained in:
Lemon
2024-04-03 11:46:39 +08:00
parent 2b62f01a38
commit 994b9cd809
3 changed files with 36 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/huawei/HuaweiServiceV2.java vendored
View File

@@ -516,24 +516,23 @@ public class HuaweiServiceV2 {
String pileConnectorCode = dto.getConnectorID();
BigDecimal chargeAmount = dto.getMoneyLimit();
String payMode = dto.getPayMode();
String orderCode = dto.getStartChargeSeq();
String requestName = "query_start_charge";
// 生成订单
String orderCode = dto.getStartChargeSeq();
// String startChargeSeq = orderCode;
QueryStartChargeDTO startChargeDTO = new QueryStartChargeDTO();
startChargeDTO.setOperatorId(ThirdPartyOperatorIdEnum.HUA_WEI.getOperatorId());
startChargeDTO.setStartChargeSeq(orderCode);
startChargeDTO.setConnectorID(pileConnectorCode);
startChargeDTO.setAccountBalance(chargeAmount);
startChargeDTO.setPayMode(dto.getPayMode());
Map<String, Object> map = orderBasicInfoService.generateOrderForThirdParty(startChargeDTO);
// QueryStartChargeDTO startChargeDTO = new QueryStartChargeDTO();
// startChargeDTO.setOperatorId(ThirdPartyOperatorIdEnum.HUA_WEI.getOperatorId());
// startChargeDTO.setStartChargeSeq(orderCode);
// startChargeDTO.setConnectorID(pileConnectorCode);
// startChargeDTO.setAccountBalance(chargeAmount);
// startChargeDTO.setPayMode(dto.getPayMode());
// Map<String, Object> map = orderBasicInfoService.generateOrderForThirdParty(startChargeDTO);
if (map == null) {
log.error("华为平台生成订单 error");
throw new BusinessException(ReturnCodeEnum.CODE_GENERATE_ORDER_ERROR);
}
// if (map == null) {
// log.error("华为平台生成订单 error");
// throw new BusinessException(ReturnCodeEnum.CODE_GENERATE_ORDER_ERROR);
// }
// 拼装参数
JSONObject jsonObject = new JSONObject();
jsonObject.put("StartChargeSeq", orderCode);
@@ -575,6 +574,8 @@ public class HuaweiServiceV2 {
orderBasicInfo.setOrderStatus(OrderStatusEnum.IN_THE_CHARGING.getValue());
// 设置开始时间
orderBasicInfo.setChargeStartTime(DateUtils.parseDate(startTime));
// 设置启动平台类型
orderBasicInfo.setThirdPartyType(ThirdPlatformTypeEnum.HUA_WEI.getTypeCode());
orderBasicInfoService.updateOrderBasicInfo(orderBasicInfo);
}
if (failReason != 0) {
@@ -801,6 +802,9 @@ public class HuaweiServiceV2 {
// 结算订单
TransactionRecordsData data = TransactionRecordsData.builder()
.transactionCode(orderBasicInfo.getTransactionCode())
.pileSn(orderBasicInfo.getPileSn())
.connectorCode(orderBasicInfo.getConnectorCode())
.consumptionAmount(String.valueOf(dto.getTotalMoney())) // 订单总金额
.stopReasonMsg(String.valueOf(dto.getStopReason())) // 停止原因
.totalElectricity(String.valueOf(dto.getTotalPower())) // 总用电量