update 个人桩预约

This commit is contained in:
Guoqs
2024-07-25 16:18:23 +08:00
parent 8f14e4e71d
commit b05a7e6ac2
9 changed files with 255 additions and 77 deletions

View File

@@ -105,7 +105,10 @@ public abstract class AbstractProgramLogic implements InitializingBean {
protected MemberGroupService memberGroupService;
@Autowired
private PileStationWhitelistService pileStationWhitelistService;
protected PileStationWhitelistService pileStationWhitelistService;
@Autowired
protected PersonalChargingRecordService personalChargingRecordService;
@Autowired
protected RedisCache redisCache;

View File

@@ -844,7 +844,7 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic {
if (!b) {
throw new BusinessException("00600006", "个人桩启动失败,无启动权限");
}
String orderCode;
// 生成订单
GenerateOrderDTO generateOrderDTO = new GenerateOrderDTO();
generateOrderDTO.setMemberId(dto.getMemberId());
@@ -853,18 +853,28 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic {
generateOrderDTO.setStartType(dto.getStartType());
generateOrderDTO.setPileSn(pileSn);
generateOrderDTO.setConnectorCode(connectorCode);
OrderBasicInfo orderBasicInfo;
try {
OrderBasicInfo orderBasicInfo = generateOrder(generateOrderDTO);
orderCode = orderBasicInfo.getOrderCode();
orderBasicInfo = generateOrder(generateOrderDTO);
} catch (ParseException e) {
throw new RuntimeException(e);
}
// 支付订单
PayOrderDTO payOrderDTO = new PayOrderDTO();
payOrderDTO.setOrderCode(orderCode);
payOrderDTO.setOrderCode(orderBasicInfo.getOrderCode());
payOrderDTO.setPayMode(OrderPayModeEnum.PAYMENT_OF_WHITELIST.getValue());
payOrderDTO.setMemberId(dto.getMemberId());
payOrder(payOrderDTO);
return orderCode;
// 插入个人桩充电记录表
try {
personalChargingRecordService.processPersonalChargingRecord(orderBasicInfo);
} catch (Exception e) {
logger.error("插入个人桩充电记录表error, orderCode:{}, transactionCode:{}",
orderBasicInfo.getOrderCode(), orderBasicInfo.getTransactionCode());
}
return orderBasicInfo.getOrderCode();
}
}