Merge branch 'dev/2024/0717/update-app-Y' of Harper/feifan-backend-zx-app into master

修改提现时间的范围设定

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/applicationforwithdrawalchannel/ApplicationForWithdrawalChannelServiceImpl.java

@@ -79,10 +79,11 @@ public class ApplicationForWithdrawalChannelServiceImpl implements ApplicationFo
         LambdaQueryWrapper<ApplicationForWithdrawalChannelDO> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(ApplicationForWithdrawalChannelDO::getPtDailyWithdrawalId, id);
         if(WithdrawalChannelTypeEnum.ALIPAY.getType().equals(withdrawalType) || WithdrawalChannelTypeEnum.BANK.getType().equals(withdrawalType)){
-            wrapper.eq(ApplicationForWithdrawalChannelDO::getWithdrawalType, WithdrawalChannelTypeEnum.ALIPAY.getType())
-                    .or()
-                    .eq(ApplicationForWithdrawalChannelDO::getWithdrawalType, WithdrawalChannelTypeEnum.BANK.getType())
-            ;
+            wrapper.and(
+                    w -> w.eq(ApplicationForWithdrawalChannelDO::getWithdrawalType, WithdrawalChannelTypeEnum.ALIPAY.getType())
+                            .or()
+                            .eq(ApplicationForWithdrawalChannelDO::getWithdrawalType, WithdrawalChannelTypeEnum.BANK.getType())
+            );
         }
         ApplicationForWithdrawalChannelDO applicationForWithdrawalChannelDO = applicationForWithdrawalChannelMapper.selectOne(wrapper);