update 查询订单退款信息

This commit is contained in:
Guoqs
2024-06-04 15:31:02 +08:00
parent 24fb5b33db
commit 5b61f2d968

View File

@@ -486,26 +486,50 @@ public class NotDelayMerchantProgramLogic extends AbstractProgramLogic {
List<OrderDetailInfoVO.OrderRefundInfo> resultList = Lists.newArrayList(); List<OrderDetailInfoVO.OrderRefundInfo> resultList = Lists.newArrayList();
// 查到原汇付支付id // 查到原汇付支付id
AdapayCallbackRecord adapayCallbackRecord = adapayCallbackRecordService.selectByOrderCode(orderBasicInfo.getOrderCode()); // AdapayCallbackRecord adapayCallbackRecord = adapayCallbackRecordService.selectByOrderCode(orderBasicInfo.getOrderCode());
if (adapayCallbackRecord == null) { // if (adapayCallbackRecord == null) {
// return resultList;
// }
List<OrderPayRecord> orderPayRecordList = orderPayRecordService.getOrderPayRecordList(orderBasicInfo.getOrderCode());
if (CollectionUtils.isEmpty(orderPayRecordList)) {
return resultList; return resultList;
} }
List<String> paymentIdList = Lists.newArrayList();
for (OrderPayRecord orderPayRecord : orderPayRecordList) {
String payMode = orderPayRecord.getPayMode();
if (StringUtils.equals(payMode, OrderPayRecordEnum.WECHATPAY_PAYMENT.getValue())
|| StringUtils.equals(payMode, OrderPayRecordEnum.ALIPAY_PAYMENT.getValue())) {
List<String> idList = orderPayRecordService.parsePaymentIdByDeductionRecord(orderPayRecord.getDeductionRecord());
paymentIdList.addAll(idList);
}
}
// 获取appId // 获取appId
String wechatAppId = pileMerchantInfoService.queryAppIdByMerchantId(orderBasicInfo.getMerchantId()); String wechatAppId = pileMerchantInfoService.queryAppIdByMerchantId(orderBasicInfo.getMerchantId());
// 通过支付id查询退款记录 // 通过支付id查询退款记录
String paymentId = adapayCallbackRecord.getPaymentId(); List<RefundInfo> refundInfoList = Lists.newArrayList();
List<RefundInfo> refundInfos = null; for (String paymentId : paymentIdList) {
try { try {
refundInfos = adapayService.queryPaymentRefund(paymentId, wechatAppId); List<RefundInfo> refundInfos = adapayService.queryPaymentRefund(paymentId, wechatAppId);
} catch (BaseAdaPayException e) { if (CollectionUtils.isNotEmpty(refundInfos)) {
logger.error("查询支付撤销对象发生异常", e); refundInfoList.addAll(refundInfos);
}
} catch (BaseAdaPayException e) {
logger.error("查询支付退款对象发生异常", e);
}
} }
// String paymentId = adapayCallbackRecord.getPaymentId();
// try {
// refundInfoList = adapayService.queryPaymentRefund(paymentId, wechatAppId);
// } catch (BaseAdaPayException e) {
// logger.error("查询支付退款对象发生异常", e);
// }
OrderDetailInfoVO.OrderRefundInfo refundInfo; OrderDetailInfoVO.OrderRefundInfo refundInfo;
if (CollectionUtils.isNotEmpty(refundInfos)) { if (CollectionUtils.isNotEmpty(refundInfoList)) {
for (RefundInfo refund : refundInfos) { for (RefundInfo refund : refundInfoList) {
refundInfo = new OrderDetailInfoVO.OrderRefundInfo(); refundInfo = new OrderDetailInfoVO.OrderRefundInfo();
refundInfo.setReverseId(refund.getRefund_id()); refundInfo.setReverseId(refund.getRefund_id());
refundInfo.setPaymentId(refund.getPayment_id()); refundInfo.setPaymentId(refund.getPayment_id());