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

111

Browse Source
This commit is contained in:
qjq
2024-11-28 18:06:08 +08:00
parent fbc2639629
commit b82ddbd3a9
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,7 +87,7 @@ public interface CardMapper extends BaseMapperX<CardDO> {
List<CardDO> cardDOS = selectList(new LambdaQueryWrapper<CardDO>() List<CardDO> cardDOS = selectList(new LambdaQueryWrapper<CardDO>()
.eq(CardDO::getFlag, flag) .eq(CardDO::getFlag, flag)
.eq(CardDO::getType, type) .eq(CardDO::getType, type)
.ne(CardDO::getBillingExist, BillingStatusEnum.BILLING_INVOICING_IS_COMPLETE.getCode()) .eq(CardDO::getBillingExist, BillingStatusEnum.BILLING_INVOICING_REJECTION.getCode())
.in(CardDO::getUserId, userIds)); .in(CardDO::getUserId, userIds));
return cardDOS.stream() return cardDOS.stream()
.map(CardDO::getChangeMoney) .map(CardDO::getChangeMoney)

11
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/billing/BillingServiceImpl.java
View File

@ -610,9 +610,20 @@ public class BillingServiceImpl implements BillingService {
.eqIfPresent(BillingDO::getCarteenId,carteenId) .eqIfPresent(BillingDO::getCarteenId,carteenId)
); );
Map<Integer, List<BillingDO>> collect = billingDOS.stream().collect(Collectors.groupingBy(BillingDO::getStatus)); Map<Integer, List<BillingDO>> collect = billingDOS.stream().collect(Collectors.groupingBy(BillingDO::getStatus));
map.put(BillingStatusEnum.BILLING_INVOICING.getCode(),0);
map.put(BillingStatusEnum.BILLING_INVOICING_IS_COMPLETE.getCode(),0);
map.put(BillingStatusEnum.BILLING_INVOICING_REJECTION.getCode(),0);
for (Map.Entry<Integer, List<BillingDO>> entry : collect.entrySet()) { for (Map.Entry<Integer, List<BillingDO>> entry : collect.entrySet()) {
if (BillingStatusEnum.BILLING_INVOICING.getCode().equals(entry.getKey())) {
map.put(entry.getKey(),entry.getValue().size()); map.put(entry.getKey(),entry.getValue().size());
} }
if (BillingStatusEnum.BILLING_INVOICING_IS_COMPLETE.getCode().equals(entry.getKey())) {
map.put(entry.getKey(),entry.getValue().size());
}
if (BillingStatusEnum.BILLING_INVOICING_REJECTION.getCode().equals(entry.getKey())) {
map.put(entry.getKey(),entry.getValue().size());
}
}
return map; return map;
} }