diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 13d3c2a1e..1f3a44dd6 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -3765,17 +3765,25 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { ? OrderStatusEnum.IN_THE_CHARGING.getValue() : OrderStatusEnum.ORDER_CLOSE_TIMEOUT.getValue(); + PileBasicInfo pileBasicInfo = pileBasicInfoService.selectPileBasicInfoBySN(chargingStartupResult.getPileSn()); + + BigDecimal payAmount = Constants.WHITELIST_DEFAULT_AMOUNT; + // 订单基本信息 OrderBasicInfo orderBasicInfo = OrderBasicInfo.builder() .orderCode(orderCode) .transactionCode(transactionCode) .orderStatus(status) + .merchantId(pileBasicInfo.getMerchantId() + "") + .stationId(pileBasicInfo.getStationId() + "") .pileSn(chargingStartupResult.getPileSn()) .connectorCode(chargingStartupResult.getConnectorCode()) .pileConnectorCode(chargingStartupResult.getPileSn() + chargingStartupResult.getConnectorCode()) .startMode("6") - .payStatus(Constants.TWO) + .payStatus(Constants.ONE) .payMode(Constants.THREE) + .payAmount(payAmount) + .payTime(DateUtils.getNowDate()) .orderAmount(BigDecimal.ZERO) .virtualAmount(BigDecimal.ZERO) .settleAmount(BigDecimal.ZERO) @@ -3789,6 +3797,17 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { .orderDetail(null) .build(); pileTransactionService.doCreateOrder(createOrderTransactionDTO); + + OrderPayRecord principalPayRecord = OrderPayRecord.builder() + .orderCode(orderCode) + .payMode(OrderPayRecordEnum.WHITELIST_PAYMENT.getValue()) + .payAmount(payAmount) + .acquirer(AcquirerEnum.LOCAL.getValue()) + .createBy("system") + .createTime(DateUtils.getNowDate()) + .delFlag(DelFlagEnum.NORMAL.getValue()) + .build(); + orderPayRecordService.batchInsert(Lists.newArrayList(principalPayRecord)); } }