From 6e8b06b433c9fda01203f299597046386314d745 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Tue, 30 May 2023 15:43:37 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=B1=87=E4=BB=98=E6=94=AF=E4=BB=98?= =?UTF-8?q?=20=E6=94=AF=E4=BB=98=E5=9B=9E=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/AdapayCallbackRecordServiceImpl.java | 2 ++ .../pile/service/impl/OrderBasicInfoServiceImpl.java | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayCallbackRecordServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayCallbackRecordServiceImpl.java index 4175e2ed2..4247e7899 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayCallbackRecordServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayCallbackRecordServiceImpl.java @@ -1,5 +1,6 @@ package com.jsowell.pile.service.impl; +import com.alibaba.fastjson2.JSON; import com.jsowell.pile.domain.AdapayCallbackRecord; import com.jsowell.pile.mapper.AdapayCallbackRecordMapper; import com.jsowell.pile.service.AdapayCallbackRecordService; @@ -27,6 +28,7 @@ public class AdapayCallbackRecordServiceImpl implements AdapayCallbackRecordServ } catch (Exception e) { log.error("查询汇付支付回调记录失败", e); } + log.info("查询汇付支付回调记录 orderCode:{}, result:{}", orderCode, JSON.toJSONString(record)); return record; } } 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 a9feab347..bd79ef40f 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 @@ -169,12 +169,12 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { if (CollectionUtils.isNotEmpty(orderListVOS)) { for (OrderListVO orderListVO : orderListVOS) { // 如果是微信支付，通过订单号查询微信支付单号 - if (StringUtils.equals(PaymentInstitutionsEnum.WECHAT_PAY.getValue(), orderListVO.getPaymentInstitutions())) { - WxpayCallbackRecord wxpayCallbackRecord = wxpayCallbackRecordService.selectByOrderCode(orderListVO.getOrderCode()); - orderListVO.setOutTradeNo(wxpayCallbackRecord.getOutTradeNo()); - } else { + if (StringUtils.equals(PaymentInstitutionsEnum.ADAPAY.getValue(), orderListVO.getPaymentInstitutions())) { AdapayCallbackRecord adapayCallbackRecord = adapayCallbackRecordService.selectByOrderCode(orderListVO.getOrderCode()); orderListVO.setOutTradeNo(adapayCallbackRecord.getPaymentId()); + } else { + WxpayCallbackRecord wxpayCallbackRecord = wxpayCallbackRecordService.selectByOrderCode(orderListVO.getOrderCode()); + orderListVO.setOutTradeNo(wxpayCallbackRecord.getOutTradeNo()); } orderListVO.setPileConnectorCode(orderListVO.getPileSn() + orderListVO.getConnectorCode()); orderListVO.setOrderStatusDescribe(transformOrderStatusDescribe(orderListVO.getOrderStatus(), orderListVO.getPayStatus()));