autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-07-08 16:08:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

查询站点订单日报详情

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-08-22 10:51:19 +08:00
parent ee65b75e18
commit 68e340a3d4
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java
View File

@@ -6,7 +6,6 @@ import com.google.common.collect.Lists;
import com.jsowell.adapay.dto.QueryPaymentConfirmDTO; import com.jsowell.adapay.dto.QueryPaymentConfirmDTO;
import com.jsowell.adapay.response.QueryPaymentConfirmDetailResponse; import com.jsowell.adapay.response.QueryPaymentConfirmDetailResponse;
import com.jsowell.adapay.service.AdapayService; import com.jsowell.adapay.service.AdapayService;
import com.jsowell.common.constant.Constants;
import com.jsowell.common.core.page.PageResponse; import com.jsowell.common.core.page.PageResponse;
import com.jsowell.common.util.DateUtils; import com.jsowell.common.util.DateUtils;
import com.jsowell.common.util.PageUtils; import com.jsowell.common.util.PageUtils;
@@ -113,12 +112,24 @@ public class SettleOrderReportServiceImpl implements ISettleOrderReportService {
QueryPaymentConfirmDetailResponse response = adapayService.queryPaymentConfirmList(build); QueryPaymentConfirmDetailResponse response = adapayService.queryPaymentConfirmList(build);
List<QueryPaymentConfirmDetailResponse.PaymentConfirmInfo> paymentConfirms = response.getPaymentConfirms(); List<QueryPaymentConfirmDetailResponse.PaymentConfirmInfo> paymentConfirms = response.getPaymentConfirms();
// 如果没有分账信息，说明没有清分 // 如果没有分账信息，说明没有清分
vo.setClearingStatus(CollectionUtils.isEmpty(paymentConfirms) ? Constants.ZERO : Constants.ONE); String clearingStatus = null;
if (Constants.ONE.equals(vo.getClearingStatus())) { if (CollectionUtils.isEmpty(paymentConfirms)) {
clearingStatus = "未清分";
} else {
clearingStatus = "已清分";
}
vo.setClearingStatus(clearingStatus);
if ("已清分".equals(vo.getClearingStatus())) {
ClearingBillVO clearingBillVO = clearingWithdrawInfoService.selectWithdrawInfoByOrderCode(orderCode); ClearingBillVO clearingBillVO = clearingWithdrawInfoService.selectWithdrawInfoByOrderCode(orderCode);
vo.setClearingBillCode(clearingBillVO.getClearingBillCode()); vo.setClearingBillCode(clearingBillVO.getClearingBillCode());
vo.setWithdrawCode(clearingBillVO.getWithdrawCode()); 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); resultList.add(vo);
} }