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 selectByMerchantId(String merchantId) throws BaseAdaPayException { - List resultList = Lists.newArrayList(); List infoList = clearingWithdrawInfoMapper.selectByMerchantId(merchantId); + List 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;