From 7ec1c5cb471be6bcb03602607deb945929364033 Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Fri, 22 Sep 2023 16:00:41 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B4=AF=E8=AE=A1=E6=8F=90=E7=8E=B0=E9=87=91?=
 =?UTF-8?q?=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ClearingWithdrawInfoServiceImpl.java  | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ClearingWithdrawInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ClearingWithdrawInfoServiceImpl.java
index c69ec8bb8..0ded732d5 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ClearingWithdrawInfoServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ClearingWithdrawInfoServiceImpl.java
@@ -3,7 +3,6 @@ package com.jsowell.pile.service.impl;
 import com.google.common.collect.Lists;
 import com.huifu.adapay.core.exception.BaseAdaPayException;
 import com.jsowell.adapay.service.AdapayService;
-import com.jsowell.adapay.vo.DrawCashDetailVO;
 import com.jsowell.common.util.DateUtils;
 import com.jsowell.common.util.StringUtils;
 import com.jsowell.pile.domain.ClearingWithdrawInfo;
@@ -103,8 +102,8 @@ public class ClearingWithdrawInfoServiceImpl implements ClearingWithdrawInfoServ
      */
     @Override
     public List<WithdrawInfoVO> selectByMerchantId(String merchantId) throws BaseAdaPayException {
-        List<WithdrawInfoVO> resultList = Lists.newArrayList();
         List<ClearingWithdrawInfo> infoList = clearingWithdrawInfoMapper.selectByMerchantId(merchantId);
+        List<WithdrawInfoVO> resultList = Lists.newArrayList();
         if (CollectionUtils.isEmpty(infoList)) {
             return resultList;
         }
@@ -118,11 +117,8 @@ public class ClearingWithdrawInfoServiceImpl implements ClearingWithdrawInfoServ
             vo.setMerchantId(merchantId);
             vo.setWithdrawCode(withdrawCode);
             vo.setApplicationTime(DateUtils.formatDateTime(clearingWithdrawInfo.getApplicationTime()));
-            DrawCashDetailVO drawCashDetailVO = adapayService.queryDrawCashDetail(withdrawCode, wechatAppId);
-            if (drawCashDetailVO != null) {
-                vo.setStatusDesc(drawCashDetailVO.getStatusDesc());
-                vo.setCashAmt(drawCashDetailVO.getCashAmt());
-            }
+            vo.setStatusDesc(clearingWithdrawInfo.getWithdrawStatus());
+            vo.setCashAmt(String.valueOf(clearingWithdrawInfo.getCreditedAmt()));
             resultList.add(vo);
         }
         return resultList;