From 65d42c0cc94c263b8273b7cb56b4ef4b0552f453 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Wed, 27 Dec 2023 17:06:31 +0800 Subject: [PATCH] update --- .../com/jsowell/service/OrderService.java | 34 +++++++++++-------- 1 file changed, 19 insertions(+), 15 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 4001baec1..04e7c2a62 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -12,7 +12,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.huifu.adapay.core.AdapayCore; import com.huifu.adapay.core.util.AdapaySign; -import com.jsowell.adapay.response.PaymentReverseResponse; import com.jsowell.adapay.vo.PaymentInfo; import com.jsowell.common.constant.CacheConstants; import com.jsowell.common.constant.Constants; @@ -482,20 +481,25 @@ public class OrderService { } } } else if (OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue().equals(orderBasicInfo.getPayMode())) { - List paymentReverseResponses = orderBasicInfoService.queryOrderAdapayRefund(orderBasicInfo); - if (CollectionUtils.isNotEmpty(paymentReverseResponses)) { - for (PaymentReverseResponse reverseResponse : paymentReverseResponses) { - refundInfo = new OrderDetailInfoVO.OrderRefundInfo(); - refundInfo.setReverseId(reverseResponse.getId()); - refundInfo.setPaymentId(reverseResponse.getPayment_id()); - refundInfo.setReverseAmt(reverseResponse.getReverse_amt()); - LocalDateTime createdTime = DateUtils.timestampToDatetime(Long.parseLong(reverseResponse.getCreated_time())); - refundInfo.setCreatedTime(DateUtils.formatDateTime(createdTime)); - LocalDateTime succeedTime = DateUtils.timestampToDatetime(Long.parseLong(reverseResponse.getSucceed_time())); - refundInfo.setSucceedTime(DateUtils.formatDateTime(succeedTime)); - orderRefundInfoList.add(refundInfo); - } - } + // List paymentReverseResponses = orderBasicInfoService.queryOrderAdapayRefund(orderBasicInfo); + // if (CollectionUtils.isNotEmpty(paymentReverseResponses)) { + // for (PaymentReverseResponse reverseResponse : paymentReverseResponses) { + // refundInfo = new OrderDetailInfoVO.OrderRefundInfo(); + // refundInfo.setReverseId(reverseResponse.getId()); + // refundInfo.setPaymentId(reverseResponse.getPayment_id()); + // refundInfo.setReverseAmt(reverseResponse.getReverse_amt()); + // LocalDateTime createdTime = DateUtils.timestampToDatetime(Long.parseLong(reverseResponse.getCreated_time())); + // refundInfo.setCreatedTime(DateUtils.formatDateTime(createdTime)); + // LocalDateTime succeedTime = DateUtils.timestampToDatetime(Long.parseLong(reverseResponse.getSucceed_time())); + // refundInfo.setSucceedTime(DateUtils.formatDateTime(succeedTime)); + // orderRefundInfoList.add(refundInfo); + // } + // } + + // 新逻辑 + String mode = pileMerchantInfoService.getDelayModeByMerchantId(orderBasicInfo.getMerchantId()); + AbstractProgramLogic orderLogic = ProgramLogicFactory.getProgramLogic(mode); + orderRefundInfoList = orderLogic.getOrderRefundInfoList(orderBasicInfo); } return orderRefundInfoList; }