|
|
@@ -384,22 +384,23 @@ public class KwpBizWalletService {
|
|
|
return PageDataResult.empty(request.getPage(), request.getPageSize());
|
|
|
}
|
|
|
|
|
|
- List<KwpBizWalletPrepayPageResponse> walletPrepayPageList = walletPrepayPage.getRecords().stream().map(prepay -> {
|
|
|
- KwpBizWalletPrepayPageResponse pageResp = KwpBizWalletPrepayPageResponse.toPageResp(prepay);
|
|
|
- KwpBizWallet wallet = kwpBizWalletRepository.getById(prepay.getWalletId());
|
|
|
- if (wallet == null) {
|
|
|
- throw new RuntimeException("钱包id:" + request.getWalletId() + ", 钱包信息不存在!");
|
|
|
- }
|
|
|
- //钱包信息
|
|
|
- pageResp.setWalletName(wallet.getName());
|
|
|
- pageResp.setAmount(wallet.getAmount());
|
|
|
- pageResp.setPrepayAmount(wallet.getPrepayAmount());
|
|
|
-
|
|
|
- //企业名称
|
|
|
- String entName = queryEntById(wallet.getSupEntId());
|
|
|
- pageResp.setSupEntName(entName);
|
|
|
- return pageResp;
|
|
|
- }).collect(Collectors.toList());
|
|
|
+ List<KwpBizWalletPrepayPageResponse> walletPrepayPageList = walletPrepayPage.getRecords().stream()
|
|
|
+ .map(prepay -> {
|
|
|
+ KwpBizWalletPrepayPageResponse pageResp = KwpBizWalletPrepayPageResponse.toPageResp(prepay);
|
|
|
+ KwpBizWallet wallet = kwpBizWalletRepository.getById(prepay.getWalletId());
|
|
|
+ if (wallet == null) {
|
|
|
+ throw new RuntimeException("钱包id:" + request.getWalletId() + ", 钱包信息不存在!");
|
|
|
+ }
|
|
|
+ //钱包信息
|
|
|
+ pageResp.setWalletName(wallet.getName());
|
|
|
+ pageResp.setAmount(wallet.getAmount());
|
|
|
+ pageResp.setPrepayAmount(wallet.getPrepayAmount());
|
|
|
+
|
|
|
+ //企业名称
|
|
|
+ String entName = queryEntById(wallet.getSupEntId());
|
|
|
+ pageResp.setSupEntName(entName);
|
|
|
+ return pageResp;
|
|
|
+ }).collect(Collectors.toList());
|
|
|
|
|
|
walletPrepayPageList.sort(Comparator.comparing(KwpBizWalletPrepayPageResponse::getCreateTime));
|
|
|
return PageDataResult.success(request.getPage(), request.getPageSize(), (long) walletPrepayPageList.size(), walletPrepayPageList);
|