mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-04-22 03:55:17 +08:00
查询站点订单日报详情
This commit is contained in:
@@ -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<QueryPaymentConfirmDetailResponse.PaymentConfirmInfo> 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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user