Merge remote-tracking branch 'origin/dev' into dev

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/WalletService.java

@@ -301,8 +301,10 @@ public class WalletService {
             if (wallet.getStatus()) {
                 List<WalletDto> data = wallet.getData();
                 if (!CollectionUtils.isEmpty(data)) {
-                    all += data.size();
-                    Map<String, List<WalletDto>> map = data.stream().collect(Collectors.groupingBy(WalletDto::getChannel));
+                    //过滤提现钱包
+                    List<WalletDto> collect = data.stream().filter(a -> StringUtils.isNotBlank(a.getFilter())).toList();
+                    all += collect.size();
+                    Map<String, List<WalletDto>> map = collect.stream().collect(Collectors.groupingBy(WalletDto::getChannel));
                     for (Map.Entry<String, List<WalletDto>> one : map.entrySet()) {
                         List<WalletDto> value = one.getValue();
                         Integer size = CollectionUtils.isEmpty(value) ? 0 : value.size();
@@ -446,9 +448,6 @@ public class WalletService {
         ChannelEnum channelEnum = null;
         if (StringUtils.isNotBlank(walletDetailReq.getChannel())) {
             channelEnum = ChannelEnum.getByValue(walletDetailReq.getChannel());
-            if (Objects.isNull(channelEnum)) {
-                throw new BusinessException("支付通道不存在");
-            }
         }
         List<WalletDto> res = new ArrayList<>();
         long sum = 0L;
@@ -1005,9 +1004,6 @@ public class WalletService {
         ChannelEnum channelEnum = null;
         if (StringUtils.isNotBlank(prePayPage.getChannel())) {
             channelEnum = ChannelEnum.getByValue(prePayPage.getChannel());
-            if (Objects.isNull(channelEnum)) {
-                throw new BusinessException("支付通道异常");
-            }
         }
         String entName = prePayPage.getEntName();
         String filter = "";
@@ -1205,9 +1201,6 @@ public class WalletService {
         ChannelEnum channelEnum = null;
         if (StringUtils.isNotBlank(prePayPage.getChannel())) {
             channelEnum = ChannelEnum.getByValue(prePayPage.getChannel());
-            if (Objects.isNull(channelEnum)) {
-                throw new BusinessException("支付通道异常");
-            }
         }
         String entName = prePayPage.getEntName();
         String filter = "";