钱包明细分页查询接口更改

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/request/KwpBizWalletPrepayRequest.java

@@ -33,10 +33,10 @@ public class KwpBizWalletPrepayRequest extends PageRequest {
     private BigDecimal amount;
 
     /**
-     * 动帐类型  0-冻结、1-预付、2-解冻、3-消费
+     * 动帐类型  0-预付、1-扣款、2-冻结、3-解冻、4-消费
      */
     @NotNull(message = "资金方向不能为空！")
-    @Schema(description = "动帐类型  0-冻结、1-预付、2-解冻、3-消费")
+    @Schema(description = "动帐类型  0-预付、1-扣款、2-冻结、3-解冻、4-消费")
     private Integer type;
 
     /**

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

@@ -74,18 +74,17 @@ public class KwpBizWalletService {
         }
 
         //查询当前登录企业
-        EntCacheResDto entCacheResDto = remoteSystemService.queryEntCacheById(LoginUserHolder.getEntId());
-        if (entCacheResDto == null) {
+        EntTypeResDto entTypeResDto = remoteSystemService.queryEntTypeById(LoginUserHolder.getEntId());
+        if (entTypeResDto == null) {
             throw new RuntimeException("entId:" + LoginUserHolder.getEntId() + ", 企业信息不存在！");
         }
         List<KwpBizWalletPageResponse> walletList = new ArrayList<>();
-        int entType = Integer.parseInt(entCacheResDto.getEntTypes());
-        if (entType == EntTypeEnum.SUPPLIER.getCode()) {
+        if (entTypeResDto.getType() == EntTypeEnum.SUPPLIER.getCode()) {
             //供应商及子企业
-            walletList = querySupWallet(entCacheResDto);
-        } else if (entType == EntTypeEnum.PURCHASER.getCode()) {
+            walletList = querySupWallet(entTypeResDto);
+        } else if (entTypeResDto.getType() == EntTypeEnum.PURCHASER.getCode()) {
             //采购商企业
-            walletList = queryProWallet(entCacheResDto.getId());
+            walletList = queryProWallet(entTypeResDto.getEntId());
         }
 
         //模糊查询过滤
@@ -104,16 +103,16 @@ public class KwpBizWalletService {
     /**
      * 查询供应商企业钱包信息
      *
-     * @param entCacheResDto
+     * @param entTypeResDto
      * @return
      */
-    private List<KwpBizWalletPageResponse> querySupWallet(EntCacheResDto entCacheResDto) {
+    private List<KwpBizWalletPageResponse> querySupWallet(EntTypeResDto entTypeResDto) {
         List<Long> entIds = new ArrayList<>();
-        entIds.add(entCacheResDto.getId());
+        entIds.add(entTypeResDto.getEntId());
         //查询供应商的子级企业
-        List<KwsEntDeptDto> kwsEntDeptDtoList = remoteSystemService.queryEntDeptByPid(entCacheResDto.getParentId());
-        List<Long> parentId = kwsEntDeptDtoList.stream().map(KwsEntDeptDto::getEntId).collect(Collectors.toList());
-        entIds.addAll(parentId);
+        List<KwsEntDeptDto> kwsEntDeptDtoList = remoteSystemService.queryEntDeptByPid(entTypeResDto.getEntId());
+        List<Long> subEntId = kwsEntDeptDtoList.stream().map(KwsEntDeptDto::getEntId).collect(Collectors.toList());
+        entIds.addAll(subEntId);
 
         //查询供应企业所关联的钱包数据
         LambdaQueryWrapper<KwpBizWallet> queryWrapper = Wrappers.<KwpBizWallet>lambdaQuery()