From 68e340a3d412b71de1ef7664c315931f2fc94632 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Tue, 22 Aug 2023 10:51:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=AB=99=E7=82=B9=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=97=A5=E6=8A=A5=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SettleOrderReportServiceImpl.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) 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 3b6a483e4..2e2139b01 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 @@ -6,7 +6,6 @@ import com.google.common.collect.Lists; import com.jsowell.adapay.dto.QueryPaymentConfirmDTO; import com.jsowell.adapay.response.QueryPaymentConfirmDetailResponse; 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.PageUtils; @@ -113,12 +112,24 @@ public class SettleOrderReportServiceImpl implements ISettleOrderReportService { QueryPaymentConfirmDetailResponse response = adapayService.queryPaymentConfirmList(build); List paymentConfirms = response.getPaymentConfirms(); // 如果没有分账信息，说明没有清分 - vo.setClearingStatus(CollectionUtils.isEmpty(paymentConfirms) ? Constants.ZERO : Constants.ONE); - if (Constants.ONE.equals(vo.getClearingStatus())) { + String clearingStatus = null; + if (CollectionUtils.isEmpty(paymentConfirms)) { + clearingStatus = "未清分"; + } else { + clearingStatus = "已清分"; + } + vo.setClearingStatus(clearingStatus); + if ("已清分".equals(vo.getClearingStatus())) { ClearingBillVO clearingBillVO = clearingWithdrawInfoService.selectWithdrawInfoByOrderCode(orderCode); vo.setClearingBillCode(clearingBillVO.getClearingBillCode()); vo.setWithdrawCode(clearingBillVO.getWithdrawCode()); - vo.setWithdrawStatus(clearingBillVO.getWithdrawStatus()); + String withdrawStatus = null; + if (StringUtils.equals(clearingBillVO.getWithdrawStatus(), "0")) { + withdrawStatus = "处理中"; + } else { + withdrawStatus = "已提现"; + } + vo.setWithdrawStatus(withdrawStatus); } resultList.add(vo); }