Просмотр исходного кода

按钱包渠道进行统计钱包清单数量接口,过滤掉提现钱包

xucaiqin 2 лет назад
Родитель
Сommit
2beaff8cdd

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

@@ -302,7 +302,7 @@ public class WalletService {
                 List<WalletDto> data = wallet.getData();
                 if (!CollectionUtils.isEmpty(data)) {
                     all += data.size();
-                    Map<String, List<WalletDto>> map = data.stream().collect(Collectors.groupingBy(WalletDto::getChannel));
+                    Map<String, List<WalletDto>> map = data.stream().filter(a -> StringUtils.isNotBlank(a.getFilter())).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();
@@ -1002,9 +1002,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 = "";
@@ -1202,9 +1199,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 = "";