mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-04-20 19:15:35 +08:00
update 0xA1双枪并充逻辑
This commit is contained in:
@@ -4712,11 +4712,12 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
|
||||
@Override
|
||||
public OrderBasicInfo saveOrderForEV(GenerateOrderDTO dto) throws ParseException {
|
||||
String pileConnectorCode = dto.getPileSn() + dto.getConnectorCode();
|
||||
// 先根据枪口号查询是否有未启动的并充订单
|
||||
OrderBasicInfo orderBasicInfo = selectNotStartMergeOrder(pileConnectorCode);
|
||||
if (orderBasicInfo != null) {
|
||||
return orderBasicInfo;
|
||||
}
|
||||
// // 先根据枪口号查询是否有未启动的并充订单
|
||||
// OrderBasicInfo orderBasicInfo = selectNotStartMergeOrder(pileConnectorCode);
|
||||
// if (orderBasicInfo != null) {
|
||||
// logger.info("查询到有未启动的并充订单,直接返回");
|
||||
// return orderBasicInfo;
|
||||
// }
|
||||
String orderCode = generateNewOrderCode();
|
||||
String transactionCode = dto.getTransactionCode();
|
||||
if (StringUtils.isBlank(transactionCode)) {
|
||||
@@ -4733,7 +4734,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
|
||||
String merchantId = pileStationInfo != null ? String.valueOf(pileStationInfo.getMerchantId()) : "";
|
||||
String plateNumber = dto.getPlateNumber() != null ? dto.getPlateNumber() : "";
|
||||
// 订单基本信息
|
||||
orderBasicInfo = OrderBasicInfo.builder()
|
||||
OrderBasicInfo orderBasicInfo = OrderBasicInfo.builder()
|
||||
.orderCode(orderCode)
|
||||
.transactionCode(transactionCode)
|
||||
.orderStatus(OrderStatusEnum.NOT_START.getValue())
|
||||
|
||||
Reference in New Issue
Block a user