冻账明细接口更新

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/repose/KwpBizWalletPrepayPageResponse.java

@@ -34,6 +34,18 @@ public class KwpBizWalletPrepayPageResponse extends PageResult {
     @Schema(description = "钱包id")
     private Long walletId;
 
+    /**
+     * 钱包名称
+     */
+    @Schema(description = "钱包名称")
+    private String walletName;
+
+    /**
+     * 供应企业名称
+     */
+    @Schema(description = "供应企业名称")
+    private String supEntName;
+
     /**
      * 订单id
      */

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/repose/vo/KwpBizWalletPrepayExcelVO.java

@@ -81,6 +81,8 @@ public class KwpBizWalletPrepayExcelVO extends PageResult {
             return new KwpBizWalletPrepayExcelVO();
         }
         KwpBizWalletPrepayExcelVO excelVO = KwpBizWalletPrepayExcelVO.getInstance();
+        excelVO.setWalletName(response.getWalletName());
+        excelVO.setSupEntName(response.getSupEntName());
         excelVO.setChangeAmount(response.getAmount());
         excelVO.setRemark(response.getRemark());
         excelVO.setCreateTime(response.getCreateTime());

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/wallet/KwpBizWalletService.java

@@ -379,18 +379,29 @@ public class KwpBizWalletService {
                 .ge(request.getStartTime() != null, KwpBizWalletPrepay::getCreateTime, request.getStartTime())
                 .lt(request.getEndTime() != null, KwpBizWalletPrepay::getCreateTime, request.getEndTime());
         Page<KwpBizWalletPrepay> walletPrepayPage = kwpBizWalletPrepayRepository.page(page, queryWrapper);
-
         //若为null,返回空分页结果
         if (walletPrepayPage == null || CollectionUtils.isEmpty(walletPrepayPage.getRecords())) {
             return PageDataResult.empty(request.getPage(), request.getPageSize());
         }
 
-        List<KwpBizWalletPrepayPageResponse> walletPrepayPageList = new ArrayList<>();
-        for (KwpBizWalletPrepay record : walletPrepayPage.getRecords()) {
-            KwpBizWalletPrepayPageResponse pageResp = KwpBizWalletPrepayPageResponse.toPageResp(record);
-            walletPrepayPageList.add(pageResp);
-        }
+        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);
     }
 
@@ -408,14 +419,9 @@ public class KwpBizWalletService {
             if (wallet == null) {
                 throw new RuntimeException("钱包id:" + request.getWalletId() + ", 钱包信息不存在！");
             }
-            excelVO.setWalletName(wallet.getName());
             excelVO.setAmount(wallet.getAmount());
             excelVO.setPrepayAmount(wallet.getPrepayAmount());
 
-            //查询企业名称
-            String entName = queryEntById(wallet.getSupEntId());
-            excelVO.setSupEntName(entName);
-
             //变动类型
             Integer type = vo.getType();
             String descByCode = PrepayTypEnum.getDescByCode(type);