From f19fbb5d0aa82718ba5c41dc4af30c2a23254081 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Fri, 14 Jul 2023 15:05:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97update?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsowell/service/OrderService.java | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java index 01d74de27..f885254a2 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -933,6 +933,20 @@ public class OrderService { // 保存到数据库 adapayCallbackRecordService.saveAdapayCallbackRecord(adapayCallbackRecord); + // 微信支付订单 记录会员交易流水 + MemberTransactionRecord record = MemberTransactionRecord.builder() + .orderCode(orderCode) + .scenarioType(type) + .memberId(memberId) + .actionType(ActionTypeEnum.FORWARD.getValue()) + .payMode(PayModeEnum.PAYMENT_OF_WECHATPAY.getValue()) + .paymentInstitutions(PaymentInstitutionsEnum.ADAPAY.getValue()) + .amount(amount) // 单位元 + .outTradeNo(adapayCallbackRecord.getPartyOrderId()) + .transactionId(adapayCallbackRecord.getOutTransId()) + .build(); + memberTransactionRecordService.insertSelective(record); + if (StringUtils.equals(type, ScenarioEnum.ORDER.getValue())) { // 1-订单支付 // 支付订单成功 PayOrderSuccessCallbackDTO callbackDTO = PayOrderSuccessCallbackDTO.builder() @@ -962,19 +976,6 @@ public class OrderService { memberBasicInfoService.updateMemberBalance(dto); } - // 微信支付订单 记录会员交易流水 - MemberTransactionRecord record = MemberTransactionRecord.builder() - .orderCode(orderCode) - .scenarioType(type) - .memberId(memberId) - .actionType(ActionTypeEnum.FORWARD.getValue()) - .payMode(PayModeEnum.PAYMENT_OF_WECHATPAY.getValue()) - .paymentInstitutions(PaymentInstitutionsEnum.ADAPAY.getValue()) - .amount(amount) // 单位元 - .outTradeNo(adapayCallbackRecord.getPartyOrderId()) - .transactionId(adapayCallbackRecord.getOutTransId()) - .build(); - memberTransactionRecordService.insertSelective(record); } private void corpMemberFailed(String data) {