zt/canteen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug

Browse Source
This commit is contained in:
zt
2025-01-11 11:49:32 +08:00
parent fed32ee0ea
commit f91c1444f9
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/card/CardMapper.java
View File

@ -121,11 +121,12 @@ public interface CardMapper extends BaseMapperX<CardDO> {
} }
default BigDecimal getTotalMoneyByGroup(List<Long> userIds,Integer year,Integer month) { default BigDecimal getTotalMoneyByGroup(List<Long> userIds,Integer year,Integer month) {
String mon = month<10?"0"+month:month.toString();
List<CardDO> cardDOS = selectList(new LambdaQueryWrapper<CardDO>() List<CardDO> cardDOS = selectList(new LambdaQueryWrapper<CardDO>()
.eq(CardDO::getFlag, CardDO.ADD) .eq(CardDO::getFlag, CardDO.ADD)
.eq(CardDO::getType, CostTypeEnum.ADMIN_PAY.getCode()) .eq(CardDO::getType, CostTypeEnum.ADMIN_PAY.getCode())
.in(CardDO::getUserId, userIds) .in(CardDO::getUserId, userIds)
.apply("DATE_FORMAT(create_time, '%Y-%m')= {0}",year+"-"+month)); .apply("DATE_FORMAT(create_time, '%Y-%m')= {0}",year+"-"+mon));
return cardDOS.stream() return cardDOS.stream()
.map(CardDO::getChangeMoney) .map(CardDO::getChangeMoney)
.filter(Objects::nonNull) .filter(Objects::nonNull)

3
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/job/GroupCountJob.java
View File

@ -80,7 +80,8 @@ public class GroupCountJob implements JobHandler {
groupCountDO.setGroupId(memberGroupDO.getId()); groupCountDO.setGroupId(memberGroupDO.getId());
groupCountDO.setGroupName(memberGroupDO.getName()); groupCountDO.setGroupName(memberGroupDO.getName());
groupCountDO.setMoney(money); groupCountDO.setMoney(money);
groupCountDO.setTime(year+"-"+month); String mon = month<10?"0"+month:month.toString();
groupCountDO.setTime(year+"-"+mon);
if(memberGroupDO.getUserId()!=null){ if(memberGroupDO.getUserId()!=null){
MemberUserDO user = userService.getUser(memberGroupDO.getUserId()); MemberUserDO user = userService.getUser(memberGroupDO.getUserId());
if (ObjectUtil.isNotEmpty(user)){ if (ObjectUtil.isNotEmpty(user)){