autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-18 00:38:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

查询退款对象

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-12-27 16:56:39 +08:00
parent dff6ddffae
commit 09c9ef7b2d
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/NotDelayMerchantProgramLogic.java
View File

@@ -9,9 +9,9 @@ import com.google.common.collect.Maps;
import com.huifu.adapay.core.exception.BaseAdaPayException; import com.huifu.adapay.core.exception.BaseAdaPayException;
import com.huifu.adapay.model.Payment; import com.huifu.adapay.model.Payment;
import com.jsowell.adapay.common.CreateAdaPaymentParam; import com.jsowell.adapay.common.CreateAdaPaymentParam;
import com.jsowell.adapay.common.RefundInfo;
import com.jsowell.adapay.config.AbstractAdapayConfig; import com.jsowell.adapay.config.AbstractAdapayConfig;
import com.jsowell.adapay.factory.AdapayConfigFactory; import com.jsowell.adapay.factory.AdapayConfigFactory;
import com.jsowell.adapay.response.PaymentReverseResponse;
import com.jsowell.adapay.response.RefundResponse; import com.jsowell.adapay.response.RefundResponse;
import com.jsowell.adapay.vo.PaymentInfo; import com.jsowell.adapay.vo.PaymentInfo;
import com.jsowell.common.constant.CacheConstants; import com.jsowell.common.constant.CacheConstants;
@@ -24,7 +24,6 @@ import com.jsowell.common.enums.adapay.MerchantDelayModeEnum;
import com.jsowell.common.enums.ykc.*; import com.jsowell.common.enums.ykc.*;
import com.jsowell.common.exception.BusinessException; import com.jsowell.common.exception.BusinessException;
import com.jsowell.common.util.AdapayUtil; import com.jsowell.common.util.AdapayUtil;
import com.jsowell.common.util.DateUtils;
import com.jsowell.common.util.StringUtils; import com.jsowell.common.util.StringUtils;
import com.jsowell.common.util.id.SnowflakeIdWorker; import com.jsowell.common.util.id.SnowflakeIdWorker;
import com.jsowell.pile.domain.*; import com.jsowell.pile.domain.*;
@@ -42,7 +41,6 @@ import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.ParseException; import java.text.ParseException;
import java.time.LocalDateTime;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
@@ -542,24 +540,24 @@ public class NotDelayMerchantProgramLogic extends AbstractProgramLogic {
// 通过支付id查询退款记录 // 通过支付id查询退款记录
String paymentId = adapayCallbackRecord.getPaymentId(); String paymentId = adapayCallbackRecord.getPaymentId();
List<PaymentReverseResponse> paymentReverseResponses = null; List<RefundInfo> refundInfos = null;
try { try {
paymentReverseResponses = adapayService.queryPaymentReverse(paymentId, wechatAppId); refundInfos = adapayService.queryPaymentRefund(paymentId, wechatAppId);
} catch (BaseAdaPayException e) { } catch (BaseAdaPayException e) {
logger.error("查询支付撤销对象发生异常", e); logger.error("查询支付撤销对象发生异常", e);
} }
OrderDetailInfoVO.OrderRefundInfo refundInfo; OrderDetailInfoVO.OrderRefundInfo refundInfo;
if (CollectionUtils.isNotEmpty(paymentReverseResponses)) { if (CollectionUtils.isNotEmpty(refundInfos)) {
for (PaymentReverseResponse reverseResponse : paymentReverseResponses) { for (RefundInfo refund : refundInfos) {
refundInfo = new OrderDetailInfoVO.OrderRefundInfo(); refundInfo = new OrderDetailInfoVO.OrderRefundInfo();
refundInfo.setReverseId(reverseResponse.getId()); refundInfo.setReverseId(refund.getRefund_id());
refundInfo.setPaymentId(reverseResponse.getPayment_id()); refundInfo.setPaymentId(refund.getPayment_id());
refundInfo.setReverseAmt(reverseResponse.getReverse_amt()); refundInfo.setReverseAmt(refund.getRefund_amt());
LocalDateTime createdTime = DateUtils.timestampToDatetime(Long.parseLong(reverseResponse.getCreated_time())); // LocalDateTime createdTime = DateUtils.timestampToDatetime(Long.parseLong(refund.getCreated_time()));
refundInfo.setCreatedTime(DateUtils.formatDateTime(createdTime)); // refundInfo.setCreatedTime(DateUtils.formatDateTime(createdTime));
LocalDateTime succeedTime = DateUtils.timestampToDatetime(Long.parseLong(reverseResponse.getSucceed_time())); // LocalDateTime succeedTime = DateUtils.timestampToDatetime(Long.parseLong(refund.getSucceed_time()));
refundInfo.setSucceedTime(DateUtils.formatDateTime(succeedTime)); // refundInfo.setSucceedTime(DateUtils.formatDateTime(succeedTime));
resultList.add(refundInfo); resultList.add(refundInfo);
} }
} }