mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-04-19 18:45:03 +08:00
update vin启动充电
This commit is contained in:
@@ -360,6 +360,9 @@ public class ConfirmStartChargingRequestHandler extends AbstractYkcHandler {
|
||||
log.info("充电桩主动申请充电逻辑, param:{}", JSON.toJSONString(confirmStartChargingData));
|
||||
Map<String, String> resultMap = new HashMap<>();
|
||||
|
||||
// 生成订单DTO
|
||||
GenerateOrderDTO dto = new GenerateOrderDTO();
|
||||
|
||||
String pileSn = confirmStartChargingData.getPileSn();
|
||||
String connectorCode = confirmStartChargingData.getConnectorCode();
|
||||
|
||||
@@ -371,10 +374,12 @@ public class ConfirmStartChargingRequestHandler extends AbstractYkcHandler {
|
||||
String startMode = confirmStartChargingData.getStartMode();
|
||||
if (StringUtils.equals("01", startMode)) {
|
||||
String physicsCard = confirmStartChargingData.getPhysicsCard();
|
||||
dto.setLogicCard(physicsCard);
|
||||
memberWalletVO = memberBasicInfoService.queryMemberInfoByCardCode(physicsCard, pileBasicInfo.getMerchantId() + "", pileBasicInfo.getStationId() + "");
|
||||
log.info("根据卡号:{},查询会员信息:{}", physicsCard, JSON.toJSONString(memberWalletVO));
|
||||
} else if (StringUtils.equals("03", startMode)) {
|
||||
String vinCode = confirmStartChargingData.getVinCode();
|
||||
dto.setVinCode(vinCode);
|
||||
memberWalletVO = memberBasicInfoService.queryByVinCode(vinCode, pileBasicInfo.getMerchantId() + "", pileBasicInfo.getStationId() + "");
|
||||
log.info("根据vin码:{},查询会员信息:{}", vinCode, JSON.toJSONString(memberWalletVO));
|
||||
}
|
||||
@@ -423,7 +428,7 @@ public class ConfirmStartChargingRequestHandler extends AbstractYkcHandler {
|
||||
resultMap.put("accountBalance", accountBalance);
|
||||
|
||||
// 异步创建订单
|
||||
GenerateOrderDTO dto = new GenerateOrderDTO();
|
||||
// GenerateOrderDTO dto = new GenerateOrderDTO();
|
||||
dto.setPileSn(pileSn);
|
||||
dto.setConnectorCode(connectorCode);
|
||||
dto.setTransactionCode(transactionCode);
|
||||
@@ -431,10 +436,11 @@ public class ConfirmStartChargingRequestHandler extends AbstractYkcHandler {
|
||||
dto.setPayMode(payMode);
|
||||
dto.setStartMode(StringUtils.equals("01", startMode) ? "2" : "5");
|
||||
dto.setMemberId(memberWalletVO.getMemberId());
|
||||
dto.setMerchantId(pileBasicInfo.getMerchantId() + "");
|
||||
|
||||
CompletableFuture.runAsync(() -> {
|
||||
try {
|
||||
Map<String, Object> map = orderBasicInfoService.generateOrderByCard(dto);
|
||||
Map<String, Object> map = orderBasicInfoService.generateOrderByCardV2(dto);
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user