From df90509fc677f96e3185c174ae73522019d42abc Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Thu, 26 Dec 2024 10:04:39 +0800 Subject: [PATCH] update --- .../java/com/jsowell/service/TempService.java | 11 +-- .../src/test/java/PaymentTestController.java | 23 ++++-- .../test/java/SpringBootTestController.java | 13 ++-- .../adapay/common/PaymentConfirmInfo.java | 70 +++++++++++++++++++ .../QueryPaymentConfirmDetailResponse.java | 58 ++------------- .../jsowell/adapay/service/AdapayService.java | 31 ++++---- .../impl/OrderBasicInfoServiceImpl.java | 11 +-- .../impl/SettleOrderReportServiceImpl.java | 5 +- .../jsowell/pile/vo/web/ClearingBillVO.java | 4 +- 9 files changed, 134 insertions(+), 92 deletions(-) create mode 100644 jsowell-pile/src/main/java/com/jsowell/adapay/common/PaymentConfirmInfo.java diff --git a/jsowell-admin/src/main/java/com/jsowell/service/TempService.java b/jsowell-admin/src/main/java/com/jsowell/service/TempService.java index 58fa26b5c..d19956b98 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/TempService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/TempService.java @@ -8,6 +8,7 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.huifu.adapay.core.exception.BaseAdaPayException; import com.jsowell.adapay.common.AdaPayment; +import com.jsowell.adapay.common.PaymentConfirmInfo; import com.jsowell.adapay.dto.QueryPaymentConfirmDTO; import com.jsowell.adapay.response.PaymentConfirmResponse; import com.jsowell.adapay.response.QueryPaymentConfirmDetailResponse; @@ -373,7 +374,7 @@ public class TempService { dto.setPaymentId(record.getPaymentId()); QueryPaymentConfirmDetailResponse response = adapayService.queryPaymentConfirmList(dto); if (response != null && CollectionUtils.isNotEmpty(response.getPaymentConfirms())) { - for (QueryPaymentConfirmDetailResponse.PaymentConfirmInfo paymentConfirm : response.getPaymentConfirms()) { + for (PaymentConfirmInfo paymentConfirm : response.getPaymentConfirms()) { JSONObject jsonObject = JSON.parseObject(paymentConfirm.getDescription()); if (StringUtils.equals(jsonObject.getString("orderCode"), orderCode)) { // 订单号对的上，累计分账金额 @@ -414,7 +415,7 @@ public class TempService { .paymentId(paymentId) .build(); QueryPaymentConfirmDetailResponse response = adapayService.queryPaymentConfirmList(build); - List paymentConfirms = response.getPaymentConfirms(); + List paymentConfirms = response.getPaymentConfirms(); if (CollectionUtils.isEmpty(paymentConfirms)) { unClearingList.add(clearingBillVO); } else { @@ -476,10 +477,10 @@ public class TempService { if (response == null) { continue; } - List confirms = response.getPaymentConfirms(); + List confirms = response.getPaymentConfirms(); if (CollectionUtils.isNotEmpty(confirms)) { // 已经分过账 - for (QueryPaymentConfirmDetailResponse.PaymentConfirmInfo confirm : confirms) { + for (PaymentConfirmInfo confirm : confirms) { JSONObject jsonObject = JSON.parseObject(confirm.getDescription()); // 找到orderCode的分账记录 @@ -521,7 +522,7 @@ public class TempService { queryPaymentConfirmDTO.setPaymentId(paymentId); QueryPaymentConfirmDetailResponse response = adapayService.queryPaymentConfirmList(queryPaymentConfirmDTO); logger.info("校验未分账的支付单-支付id:{}, 查询到的分账信息:{}", paymentId, JSON.toJSONString(response)); - List confirms = response.getPaymentConfirms(); + List confirms = response.getPaymentConfirms(); if (CollectionUtils.isEmpty(confirms)) { logger.info("校验未分账的支付单-支付id:{}没有进行过分账", paymentId); // 没有配置结算账户的，默认分到本商户 diff --git a/jsowell-admin/src/test/java/PaymentTestController.java b/jsowell-admin/src/test/java/PaymentTestController.java index c9db0ebf0..d845f11ae 100644 --- a/jsowell-admin/src/test/java/PaymentTestController.java +++ b/jsowell-admin/src/test/java/PaymentTestController.java @@ -8,6 +8,7 @@ import com.huifu.adapay.core.exception.BaseAdaPayException; import com.huifu.adapay.model.PaymentReverse; import com.huifu.adapay.model.Refund; import com.jsowell.JsowellApplication; +import com.jsowell.adapay.common.PaymentConfirmInfo; import com.jsowell.adapay.dto.QueryConfirmReverseDTO; import com.jsowell.adapay.dto.QueryPaymentConfirmDTO; import com.jsowell.adapay.operation.PaymentReverseOperation; @@ -310,12 +311,12 @@ public class PaymentTestController { // 查询分账信息 QueryPaymentConfirmDetailResponse response = adapayService.queryPaymentConfirmList(dto); if (response != null) { - List confirms = response.getPaymentConfirms(); + List confirms = response.getPaymentConfirms(); if (CollectionUtils.isEmpty(confirms)) { unSplitList.add(paymentId); } else { splitList.add(paymentId); - for (QueryPaymentConfirmDetailResponse.PaymentConfirmInfo confirm : confirms) { + for (PaymentConfirmInfo confirm : confirms) { if (queryConfirmReverseStatus(confirm)) { System.out.println("支付确认id:" + confirm.getId() + "撤销了。。。"); continue; @@ -349,7 +350,7 @@ public class PaymentTestController { * @return * @throws BaseAdaPayException */ - private boolean queryConfirmReverseStatus(QueryPaymentConfirmDetailResponse.PaymentConfirmInfo confirm) throws BaseAdaPayException { + private boolean queryConfirmReverseStatus(PaymentConfirmInfo confirm) throws BaseAdaPayException { boolean result = false; QueryConfirmReverseDTO dto = QueryConfirmReverseDTO.builder() .paymentConfirmId(confirm.getId()) @@ -377,10 +378,10 @@ public class PaymentTestController { dto.setWechatAppId(wechatAppId1); QueryPaymentConfirmDetailResponse response = adapayService.queryPaymentConfirmList(dto); if (response != null) { - List confirms = response.getPaymentConfirms(); + List confirms = response.getPaymentConfirms(); System.out.println("支付id:" + paymentId + ", 确认信息:" + JSON.toJSONString(confirms)); if (CollectionUtils.isNotEmpty(confirms)) { - for (QueryPaymentConfirmDetailResponse.PaymentConfirmInfo confirm : confirms) { + for (PaymentConfirmInfo confirm : confirms) { adapayService.createConfirmReverse(confirm.getId(), wechatAppId1); } } @@ -486,4 +487,16 @@ public class PaymentTestController { OrderSplitResult orderSplitResult = orderBasicInfoService.verifyOrderConfirmAmount(paymentIds, orderCode, settleAmount, wechatAppId); System.out.println(JSON.toJSONString(orderSplitResult)); } + + @Test + public void queryPaymentConfirmDetailTest() throws BaseAdaPayException { + + // 查询支付确认id + QueryPaymentConfirmDTO dto = new QueryPaymentConfirmDTO(); + dto.setPaymentId("002212024121307453510713429549121368064"); + dto.setWechatAppId(wechatAppId1); + // 查询分账信息 + QueryPaymentConfirmDetailResponse response = adapayService.queryPaymentConfirmList(dto); + System.out.println(JSON.toJSONString(response)); + } } diff --git a/jsowell-admin/src/test/java/SpringBootTestController.java b/jsowell-admin/src/test/java/SpringBootTestController.java index e37ea13ac..aecf593b8 100644 --- a/jsowell-admin/src/test/java/SpringBootTestController.java +++ b/jsowell-admin/src/test/java/SpringBootTestController.java @@ -17,6 +17,7 @@ import com.huifu.adapay.model.Payment; import com.huifu.adapay.model.PaymentReverse; import com.huifu.adapay.model.Refund; import com.jsowell.JsowellApplication; +import com.jsowell.adapay.common.PaymentConfirmInfo; import com.jsowell.adapay.config.AbstractAdapayConfig; import com.jsowell.adapay.dto.*; import com.jsowell.adapay.factory.AdapayConfigFactory; @@ -932,7 +933,7 @@ public class SpringBootTestController { dto.setWechatAppId(wechatAppId1); dto.setPaymentId("002212023122208033310584061601344237568"); QueryPaymentConfirmDetailResponse response = adapayService.queryPaymentConfirmList(dto); - List paymentConfirms = response.getPaymentConfirms(); + List paymentConfirms = response.getPaymentConfirms(); // 如果没有分账信息，说明没有清分 String clearingStatus = null; if (org.springframework.util.CollectionUtils.isEmpty(paymentConfirms)) { @@ -1103,12 +1104,12 @@ public class SpringBootTestController { // 查询分账信息 QueryPaymentConfirmDetailResponse response = adapayService.queryPaymentConfirmList(dto); if (response != null) { - List confirms = response.getPaymentConfirms(); + List confirms = response.getPaymentConfirms(); if (CollectionUtils.isEmpty(confirms)) { unSplitList.add(paymentId); } else { splitList.add(paymentId); - for (QueryPaymentConfirmDetailResponse.PaymentConfirmInfo confirm : confirms) { + for (PaymentConfirmInfo confirm : confirms) { if (queryConfirmReverseStatus(confirm)) { System.out.println("支付确认id:" + confirm.getId() + "撤销了。。。"); continue; @@ -1136,7 +1137,7 @@ public class SpringBootTestController { System.out.println("=================自己:" + JSON.toJSONString(selfList) + ", 数量:" + selfList.size()); } - private boolean queryConfirmReverseStatus(QueryPaymentConfirmDetailResponse.PaymentConfirmInfo confirm) throws BaseAdaPayException { + private boolean queryConfirmReverseStatus(PaymentConfirmInfo confirm) throws BaseAdaPayException { boolean result = false; QueryConfirmReverseDTO dto = QueryConfirmReverseDTO.builder() @@ -1202,10 +1203,10 @@ public class SpringBootTestController { dto.setWechatAppId(wechatAppId1); QueryPaymentConfirmDetailResponse response = adapayService.queryPaymentConfirmList(dto); if (response != null) { - List confirms = response.getPaymentConfirms(); + List confirms = response.getPaymentConfirms(); System.out.println("支付id:" + paymentId + ", 确认信息:" + JSON.toJSONString(confirms)); if (CollectionUtils.isNotEmpty(confirms)) { - for (QueryPaymentConfirmDetailResponse.PaymentConfirmInfo confirm : confirms) { + for (PaymentConfirmInfo confirm : confirms) { adapayService.createConfirmReverse(confirm.getId(), wechatAppId1); } } diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/common/PaymentConfirmInfo.java b/jsowell-pile/src/main/java/com/jsowell/adapay/common/PaymentConfirmInfo.java new file mode 100644 index 000000000..481be3d51 --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/adapay/common/PaymentConfirmInfo.java @@ -0,0 +1,70 @@ +package com.jsowell.adapay.common; + +import com.alibaba.fastjson.annotation.JSONField; +import com.jsowell.adapay.response.AdapayBaseResponse; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * 支付确认对象 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class PaymentConfirmInfo extends AdapayBaseResponse { + /** + * 返参，必填，由AdaPay生成的支付对象 ID + */ + @JSONField(name = "id") + private String id; + + /** + * 返参，必填，支付创建时的时间戳 + */ + @JSONField(name = "created_time") + private String createdTime; + + /** + * 必填，订单号 + */ + @JSONField(name = "order_no") + private String orderNo; + + /** + * 商户发起支付的应用id，不同的前端应用将无法使用该 Payment 对象完成支付 + */ + @JSONField(name = "app_id") + private String appId; + + @JSONField(name = "confirm_amt") + private String confirmAmt; + + @JSONField(name = "confirmed_amt") + private String confirmedAmt; + + @JSONField(name = "fee_mode") + private String feeMode; + + private String description; + + @JSONField(name = "reserved_amt") + private String reservedAmt; + + @JSONField(name = "refunded_amt") + private String refundedAmt; + + @JSONField(name = "fee_amt") + private String feeAmt; + + @JSONField(name = "error_msg") + private String errorMsg; + + @JSONField(name = "div_members") + private List divMembers; + +} \ No newline at end of file diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/response/QueryPaymentConfirmDetailResponse.java b/jsowell-pile/src/main/java/com/jsowell/adapay/response/QueryPaymentConfirmDetailResponse.java index 6ac632caf..1ea5a2fe5 100644 --- a/jsowell-pile/src/main/java/com/jsowell/adapay/response/QueryPaymentConfirmDetailResponse.java +++ b/jsowell-pile/src/main/java/com/jsowell/adapay/response/QueryPaymentConfirmDetailResponse.java @@ -1,9 +1,8 @@ package com.jsowell.adapay.response; import com.alibaba.fastjson.annotation.JSONField; +import com.jsowell.adapay.common.PaymentConfirmInfo; import lombok.Data; -import lombok.Getter; -import lombok.Setter; import java.util.List; @@ -11,12 +10,12 @@ import java.util.List; * 查询支付确认对象详情反参 */ @Data -public class QueryPaymentConfirmDetailResponse extends AdapayBaseResponse{ +public class QueryPaymentConfirmDetailResponse extends AdapayBaseResponse { @JSONField(name = "payment_id") private String paymentId; - @JSONField(name = "prod_mode") - private String prodMode; + // @JSONField(name = "prod_mode") + // private String prodMode; @JSONField(name = "payment_confirms") private List paymentConfirms; @@ -29,53 +28,4 @@ public class QueryPaymentConfirmDetailResponse extends AdapayBaseResponse{ @JSONField(name = "object") private String object; - - @Getter - @Setter - public static class PaymentConfirmInfo{ - /** - * 返参，必填，由AdaPay生成的支付对象 ID - */ - @JSONField(name = "id") - private String id; - - /** - * 返参，必填，支付创建时的时间戳 - */ - @JSONField(name = "created_time") - private String createdTime; - - /** - * 必填，订单号 - */ - @JSONField(name = "order_no") - private String orderNo; - - /** - * 商户发起支付的应用id，不同的前端应用将无法使用该 Payment 对象完成支付 - */ - @JSONField(name = "app_id") - private String appId; - - @JSONField(name = "confirm_amt") - private String confirmAmt; - - @JSONField(name = "confirmed_amt") - private String confirmedAmt; - - @JSONField(name = "fee_mode") - private String feeMode; - - private String description; - - @JSONField(name = "reserved_amt") - private String reservedAmt; - - @JSONField(name = "refunded_amt") - private String refundedAmt; - - @JSONField(name = "fee_amt") - private String feeAmt; - - } } diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java index 65cbd2545..09b2f814f 100644 --- a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java +++ b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java @@ -8,11 +8,10 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.huifu.adapay.core.exception.BaseAdaPayException; +import com.huifu.adapay.model.CorpMember; +import com.huifu.adapay.model.SettleAccount; import com.huifu.adapay.model.*; -import com.jsowell.adapay.common.AdaPayment; -import com.jsowell.adapay.common.CreateAdaPaymentParam; -import com.jsowell.adapay.common.DivMember; -import com.jsowell.adapay.common.RefundInfo; +import com.jsowell.adapay.common.*; import com.jsowell.adapay.config.AbstractAdapayConfig; import com.jsowell.adapay.dto.*; import com.jsowell.adapay.factory.AdapayConfigFactory; @@ -51,7 +50,10 @@ import org.springframework.transaction.annotation.Transactional; import java.io.File; import java.math.BigDecimal; -import java.util.*; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; @@ -1225,11 +1227,11 @@ public class AdapayService { QueryPaymentConfirmDetailResponse response = null; // 查缓存 String redisKey = CacheConstants.PAYMENT_CONFIRM_LIST + dto.getPaymentId(); - String redisResult = redisCache.getCacheObject(redisKey); - if (StringUtils.isNotBlank(redisResult)) { - response = JSONObject.parseObject(redisResult, QueryPaymentConfirmDetailResponse.class); - return response; - } + // String redisResult = redisCache.getCacheObject(redisKey); + // if (StringUtils.isNotBlank(redisResult)) { + // response = JSONObject.parseObject(redisResult, QueryPaymentConfirmDetailResponse.class); + // return response; + // } AbstractAdapayConfig config = AdapayConfigFactory.getConfig(dto.getWechatAppId()); if (config == null) { @@ -1243,7 +1245,7 @@ public class AdapayService { Map map = PaymentConfirm.queryList(param, config.getWechatAppId()); response = JSON.parseObject(JSON.toJSONString(map), QueryPaymentConfirmDetailResponse.class); // log.info("queryPaymentConfirmDetailResponse:{}", JSON.toJSONString(queryPaymentConfirmDetailResponse)); - redisCache.setCacheObject(redisKey, JSON.toJSONString(response), CacheConstants.cache_expire_time_12h); + redisCache.setCacheObject(redisKey, JSON.toJSONString(response), CacheConstants.cache_expire_time_10m); } catch (BaseAdaPayException e) { log.error("查询支付确认对象列表error", e); } @@ -1253,7 +1255,7 @@ public class AdapayService { /** * 查询支付确认对象详情 */ - public QueryPaymentConfirmDetailResponse.PaymentConfirmInfo queryPaymentConfirmDetail(QueryPaymentConfirmDTO dto) { + public PaymentConfirmInfo queryPaymentConfirmDetail(QueryPaymentConfirmDTO dto) { AbstractAdapayConfig config = AdapayConfigFactory.getConfig(dto.getWechatAppId()); if (config == null) { throw new BusinessException(ReturnCodeEnum.CODE_ADAPAY_CONFIG_IS_NULL_ERROR); @@ -1261,10 +1263,11 @@ public class AdapayService { Map confirmParams = Maps.newHashMap(); confirmParams.put("payment_confirm_id", dto.getPaymentConfirmId()); - QueryPaymentConfirmDetailResponse.PaymentConfirmInfo result = null; + PaymentConfirmInfo result = null; try { Map paymentConfirm = PaymentConfirm.query(confirmParams, config.getWechatAppId()); - result = JSON.parseObject(JSON.toJSONString(paymentConfirm), QueryPaymentConfirmDetailResponse.PaymentConfirmInfo.class); + log.info("查询支付确认对象详情:{}", JSON.toJSONString(paymentConfirm)); + result = JSON.parseObject(JSON.toJSONString(paymentConfirm), PaymentConfirmInfo.class); } catch (BaseAdaPayException e) { throw new RuntimeException(e); } 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 07ec9b97d..5cf4dc620 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 @@ -7,6 +7,7 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.huifu.adapay.core.exception.BaseAdaPayException; import com.jsowell.adapay.common.DivMember; +import com.jsowell.adapay.common.PaymentConfirmInfo; import com.jsowell.adapay.dto.QueryConfirmReverseDTO; import com.jsowell.adapay.dto.QueryPaymentConfirmDTO; import com.jsowell.adapay.operation.PaymentReverseOperation; @@ -52,7 +53,9 @@ import com.jsowell.pile.transaction.dto.OrderTransactionDTO; import com.jsowell.pile.transaction.service.TransactionService; import com.jsowell.pile.util.UserUtils; import com.jsowell.pile.vo.SupStationStatsVO; -import com.jsowell.pile.vo.base.*; +import com.jsowell.pile.vo.base.MerchantOrderInfoVO; +import com.jsowell.pile.vo.base.OrderAmountDetailVO; +import com.jsowell.pile.vo.base.OrderPeriodAmountVO; import com.jsowell.pile.vo.base.PileInfoVO; import com.jsowell.pile.vo.lianlian.AccumulativeInfoVO; import com.jsowell.pile.vo.nanrui.JiangSuOrderInfoVO; @@ -1583,9 +1586,9 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { dto.setWechatAppId(wechatAppId); QueryPaymentConfirmDetailResponse response = adapayService.queryPaymentConfirmList(dto); if (response != null) { - List confirms = response.getPaymentConfirms(); + List confirms = response.getPaymentConfirms(); if (CollectionUtils.isNotEmpty(confirms)) { - for (QueryPaymentConfirmDetailResponse.PaymentConfirmInfo confirm : confirms) { + for (PaymentConfirmInfo confirm : confirms) { // 校验分账是否撤销 if (queryConfirmReverseStatus(confirm.getId(), wechatAppId)) { logger.info("支付确认id:" + confirm.getId() + "撤销了。。。"); @@ -3371,7 +3374,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { // dto.setPaymentId(record.getPaymentId()); // QueryPaymentConfirmDetailResponse response = adapayService.queryPaymentConfirmList(dto); // if (response != null && CollectionUtils.isNotEmpty(response.getPaymentConfirms())) { - // for (QueryPaymentConfirmDetailResponse.PaymentConfirmInfo paymentConfirm : response.getPaymentConfirms()) { + // for (PaymentConfirmInfo paymentConfirm : response.getPaymentConfirms()) { // JSONObject jsonObject = JSON.parseObject(paymentConfirm.getDescription()); // if (StringUtils.equals(jsonObject.getString("orderCode"), orderCode)) { // // 订单号对的上，累计分账金额 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java index b46b31d4d..8ba365888 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java @@ -5,6 +5,7 @@ import com.github.pagehelper.PageInfo; import com.google.common.base.Joiner; import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import com.jsowell.adapay.common.PaymentConfirmInfo; import com.jsowell.adapay.dto.QueryPaymentConfirmDTO; import com.jsowell.adapay.response.QueryPaymentConfirmDetailResponse; import com.jsowell.adapay.service.AdapayService; @@ -126,7 +127,7 @@ public class SettleOrderReportServiceImpl implements SettleOrderReportService { .paymentId(paymentId) .build(); QueryPaymentConfirmDetailResponse response = adapayService.queryPaymentConfirmList(build); - List paymentConfirms = response.getPaymentConfirms(); + List paymentConfirms = response.getPaymentConfirms(); // 如果没有分账信息，说明没有清分 String clearingStatus = null; if (CollectionUtils.isEmpty(paymentConfirms)) { @@ -548,7 +549,7 @@ public class SettleOrderReportServiceImpl implements SettleOrderReportService { .paymentId(paymentId) .build(); QueryPaymentConfirmDetailResponse response = adapayService.queryPaymentConfirmList(build); - List paymentConfirms = response.getPaymentConfirms(); + List paymentConfirms = response.getPaymentConfirms(); if (!CollectionUtils.isEmpty(paymentConfirms)) { clearingBillVO.setConfirmInfo(paymentConfirms.get(0)); clearingList.add(clearingBillVO); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/ClearingBillVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/ClearingBillVO.java index 874cb4f24..d0b1a29db 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/ClearingBillVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/ClearingBillVO.java @@ -1,6 +1,6 @@ package com.jsowell.pile.vo.web; -import com.jsowell.adapay.response.QueryPaymentConfirmDetailResponse; +import com.jsowell.adapay.common.PaymentConfirmInfo; import lombok.Data; import java.math.BigDecimal; @@ -37,5 +37,5 @@ public class ClearingBillVO { */ private String withdrawStatus; - private QueryPaymentConfirmDetailResponse.PaymentConfirmInfo confirmInfo; + private PaymentConfirmInfo confirmInfo; }