From 3203d99144d1b892df1ea762e8d090fecfd032d4 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Mon, 25 Mar 2024 12:33:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E8=AE=A2=E5=8D=95=E6=97=B6?= =?UTF-8?q?=E4=B8=8D=E4=BF=9D=E5=AD=98=E6=94=AF=E4=BB=98=E9=87=91=E9=A2=9D?= =?UTF-8?q?=EF=BC=8C=E5=9C=A8=E6=94=AF=E4=BB=98=E6=88=90=E5=8A=9F=E5=90=8E?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=94=AF=E4=BB=98=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pile/service/impl/OrderBasicInfoServiceImpl.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) 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 e4cf1aba1..60cf25793 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 @@ -1907,7 +1907,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { .orderBasicInfo(orderBasicInfo) .orderDetail(orderDetail) .build(); - pileTransactionService.doCreateOrder(createOrderTransactionDTO); + pileTransactionService.doCreateOrder(createOrderTransactionDTO); // 保存异常订单到订单主表 } /** @@ -2593,7 +2593,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { .orderBasicInfo(orderBasicInfo) .orderDetail(orderDetail) .build(); - pileTransactionService.doCreateOrder(createOrderTransactionDTO); + pileTransactionService.doCreateOrder(createOrderTransactionDTO); // 联联平台生成订单 // 组装结果集 Map resultMap = Maps.newHashMap(); @@ -3083,7 +3083,10 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { orderInfo.setPayMode(dto.getPayMode()); orderInfo.setPayStatus(OrderPayStatusEnum.paid.getValue()); BigDecimal orderPayAmount = orderInfo.getPayAmount() == null ? BigDecimal.ZERO : orderInfo.getPayAmount(); - orderInfo.setPayAmount(orderPayAmount.add(payAmount)); + // 2024年3月25日12点26分 发现重复记录的情况 + if(orderPayAmount.compareTo(payAmount) != 0) { + orderInfo.setPayAmount(orderPayAmount.add(payAmount)); + } orderInfo.setPayTime(new Date()); if (sendStartCharging) { @@ -3515,7 +3518,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { .pileConnectorCode(dto.getPileSn() + dto.getConnectorCode()) .startMode(dto.getStartMode()) .payStatus(Constants.ZERO) - .payAmount(dto.getChargeAmount()) // 支付完成后填入支付金额 + // .payAmount(dto.getChargeAmount()) // 支付完成后填入支付金额 .payMode(dto.getPayMode()) .plateNumber(plateNumber) .orderAmount(BigDecimal.ZERO)