diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/card/CardMapper.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/card/CardMapper.java index 956c78ba..a222e090 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/card/CardMapper.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/card/CardMapper.java @@ -1,6 +1,8 @@ package cn.iocoder.yudao.module.member.dal.mysql.card; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; @@ -81,10 +83,12 @@ public interface CardMapper extends BaseMapperX { .eq(CardDO::getType, type) .eq(CardDO::getBillingExist, var) .in(CardDO::getUserId, userIds)); - if(var2==null){ - return cardDOS; + if(var2!=null){ + return cardDOS.stream().filter(f-> f.getCreateTime().getMonth().getValue()==var2).collect(Collectors.toList()); }else{ - return cardDOS.stream().filter(f-> f.getCreateTime().getMonth().getValue()!=var2).collect(Collectors.toList()); + DateTime date = DateUtil.date(); + int i = date.monthBaseOne(); + return cardDOS.stream().filter(f-> f.getCreateTime().getMonth().getValue()!=i).collect(Collectors.toList()); } } default BigDecimal getTotalMoneyByuserIds(Collection userIds, String flag, String type,Integer var) { @@ -94,7 +98,11 @@ public interface CardMapper extends BaseMapperX { .eq(CardDO::getBillingExist, BillingStatusEnum.BILLING_INVOICING_REJECTION.getCode()) .in(CardDO::getUserId, userIds)); if(var!=null){ - cardDOS=cardDOS.stream().filter(f-> f.getCreateTime().getMonth().getValue()!=var).collect(Collectors.toList()); + cardDOS=cardDOS.stream().filter(f-> f.getCreateTime().getMonth().getValue()==var).collect(Collectors.toList()); + }else{ + DateTime date = DateUtil.date(); + int i = date.monthBaseOne(); + cardDOS=cardDOS.stream().filter(f-> f.getCreateTime().getMonth().getValue()!=i).collect(Collectors.toList()); } return cardDOS.stream() .map(CardDO::getChangeMoney) diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/billing/BillingServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/billing/BillingServiceImpl.java index 8a623ef1..4c76f4d8 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/billing/BillingServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/billing/BillingServiceImpl.java @@ -470,7 +470,7 @@ public class BillingServiceImpl implements BillingService { DateTime date = DateUtil.date(); Integer month=null; int day = date.dayOfMonth(); - if(day<=26){ + if(day>26){ month= date.monthBaseOne(); } return month;