From 6872a1857575f0cd30ff5cf908d766c5e1790696 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Sat, 6 Jan 2024 09:36:06 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=9F=A5=E8=AF=A2=E6=8F=90=E7=8E=B0?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ClearingWithdrawInfoServiceImpl.java | 10 +++++++++- .../service/impl/SettleOrderReportServiceImpl.java | 4 ++-- 2 files changed, 11 insertions(+), 3 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 60e91a8cd..96edb7e2d 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 @@ -6,8 +6,10 @@ import com.google.common.collect.Lists; import com.huifu.adapay.core.exception.BaseAdaPayException; import com.jsowell.adapay.dto.QueryWithdrawListDTO; import com.jsowell.adapay.service.AdapayService; +import com.jsowell.common.constant.Constants; import com.jsowell.common.core.page.PageResponse; import com.jsowell.common.util.DateUtils; +import com.jsowell.common.util.StringUtils; import com.jsowell.pile.domain.ClearingWithdrawInfo; import com.jsowell.pile.mapper.ClearingWithdrawInfoMapper; import com.jsowell.pile.service.ClearingWithdrawInfoService; @@ -141,7 +143,13 @@ public class ClearingWithdrawInfoServiceImpl implements ClearingWithdrawInfoServ vo.setMerchantId(clearingWithdrawInfo.getMerchantId()); vo.setWithdrawCode(clearingWithdrawInfo.getWithdrawCode()); vo.setApplicationTime(DateUtils.formatDateTime(clearingWithdrawInfo.getApplicationTime())); - vo.setStatusDesc(clearingWithdrawInfo.getWithdrawStatus()); + String statusDesc = null; + if (StringUtils.equals(clearingWithdrawInfo.getWithdrawStatus(), Constants.ZERO)) { + statusDesc = "处理中"; + } else if (StringUtils.equals(clearingWithdrawInfo.getWithdrawStatus(), Constants.ONE)){ + statusDesc = "已提现"; + } + vo.setStatusDesc(statusDesc); vo.setCashAmt(clearingWithdrawInfo.getCreditedAmt()); resultList.add(vo); } 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 f9263edfc..51f80f4ec 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 @@ -143,9 +143,9 @@ public class SettleOrderReportServiceImpl implements ISettleOrderReportService { vo.setClearingBillCode(clearingBillVO.getClearingBillCode()); vo.setWithdrawCode(clearingBillVO.getWithdrawCode()); String withdrawStatus = null; - if (StringUtils.equals(clearingBillVO.getWithdrawStatus(), "0")) { + if (StringUtils.equals(clearingBillVO.getWithdrawStatus(), Constants.ZERO)) { withdrawStatus = "处理中"; - } else if (StringUtils.equals(clearingBillVO.getWithdrawStatus(), "1")){ + } else if (StringUtils.equals(clearingBillVO.getWithdrawStatus(), Constants.ONE)){ withdrawStatus = "已提现"; } vo.setWithdrawStatus(withdrawStatus);