From 38dbafa11665f882019b7bbc081c08f25a874962 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Mon, 28 Aug 2023 17:17:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E6=98=93=E5=88=86=E8=B4=A6=20?= =?UTF-8?q?=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OrderBasicInfoServiceImpl.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 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 d06f7a13f..98c85c9da 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 @@ -3119,14 +3119,16 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { // 记录支订单付流水 List payRecordList = Lists.newArrayList(); for (BalanceDeductionAmountVO balanceDeductionAmountVO : list) { + String paymentId = balanceDeductionAmountVO.getPaymentId(); + BigDecimal deductionAmount = balanceDeductionAmountVO.getDeductionAmount(); JSONObject json = new JSONObject(); - json.put("paymentId", balanceDeductionAmountVO.getPaymentId()); - json.put("amount", balanceDeductionAmountVO.getDeductionAmount()); + json.put("paymentId", paymentId); + json.put("amount", deductionAmount); // 记录流水 payRecordList.add(OrderPayRecord.builder() .orderCode(orderCode) .payMode(OrderPayRecordEnum.PRINCIPAL_BALANCE_PAYMENT.getValue()) - .payAmount(balanceDeductionAmountVO.getDeductionAmount()) + .payAmount(deductionAmount) .acquirer(AcquirerEnum.LOCAL.getValue()) .deductionRecord(json.toJSONString()) .createBy(dto.getMemberId()) @@ -3135,6 +3137,14 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { // 订单支付流水入库 if (CollectionUtils.isNotEmpty(payRecordList)) { orderPayRecordService.batchInsert(payRecordList); + for (OrderPayRecord record : payRecordList) { + String deductionRecord = record.getDeductionRecord(); + JSONObject jsonObject = JSON.parseObject(deductionRecord); + String paymentId = jsonObject.getString("paymentId"); + BigDecimal amount = jsonObject.getBigDecimal("amount"); + // 余额支付 临时冻结金额 + memberAdapayRecordService.updateFreezeAmount(paymentId, amount); + } } // 余额支付可以直接调支付回调方法