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

充值记录增加分组id 条件

Browse Source
This commit is contained in:
qjq
2024-12-24 17:25:22 +08:00
parent dd82390592
commit 5e247cb63a
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,11 +81,12 @@ public interface CardMapper extends BaseMapperX<CardDO> {
} }
return lastCardDO.getMoney(); return lastCardDO.getMoney();
} }
default List<CardDO> getMoneyByUserIds(Collection<Long> userIds , String flag, String type,Integer var,Integer var2){ default List<CardDO> getMoneyByUserIds(Collection<Long> userIds , String flag, String type,Integer var,Integer var2,Long groupId){
List<CardDO> cardDOS = selectList(new LambdaQueryWrapperX<CardDO>() List<CardDO> cardDOS = selectList(new LambdaQueryWrapperX<CardDO>()
.eq(CardDO::getFlag, flag) .eq(CardDO::getFlag, flag)
.eq(CardDO::getType, type) .eq(CardDO::getType, type)
.eq(CardDO::getBillingExist, var) .eq(CardDO::getBillingExist, var)
.eqIfPresent(CardDO::getGroupId,groupId)
.in(CardDO::getUserId, userIds)); .in(CardDO::getUserId, userIds));
DateTime date = DateUtil.date(); DateTime date = DateUtil.date();
int year = date.year(); int year = date.year();
@ -97,10 +98,11 @@ public interface CardMapper extends BaseMapperX<CardDO> {
return cardDOS.stream().filter(f-> f.getCreateTime().getMonth().getValue()!=i).collect(Collectors.toList()); return cardDOS.stream().filter(f-> f.getCreateTime().getMonth().getValue()!=i).collect(Collectors.toList());
} }
} }
default BigDecimal getTotalMoneyByuserIds(Collection<Long> userIds, String flag, String type,Integer var) { default BigDecimal getTotalMoneyByuserIds(Collection<Long> userIds, String flag, String type,Integer var,Long groupId) {
List<CardDO> cardDOS = selectList(new LambdaQueryWrapper<CardDO>() List<CardDO> cardDOS = selectList(new LambdaQueryWrapperX<CardDO>()
.eq(CardDO::getFlag, flag) .eq(CardDO::getFlag, flag)
.eq(CardDO::getType, type) .eq(CardDO::getType, type)
.eqIfPresent(CardDO::getGroupId,groupId)
.eq(CardDO::getBillingExist, BillingStatusEnum.BILLING_INVOICING_REJECTION.getCode()) .eq(CardDO::getBillingExist, BillingStatusEnum.BILLING_INVOICING_REJECTION.getCode())
.in(CardDO::getUserId, userIds)); .in(CardDO::getUserId, userIds));
DateTime date = DateUtil.date(); DateTime date = DateUtil.date();

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

@ -254,7 +254,7 @@ public class BillingServiceImpl implements BillingService {
billing.setCarteenId(memberGroupService.getGroup(createReqVO.getUserId()).getCarteenId()); billing.setCarteenId(memberGroupService.getGroup(createReqVO.getUserId()).getCarteenId());
billing.setUserId(billing.getUserId()); billing.setUserId(billing.getUserId());
//查询单位充值的金额 //查询单位充值的金额
List<CardDO> moneyByUserIds = cardMapper.getMoneyByUserIds(createReqVO.getOrderId(), CardDO.ADD, CostTypeEnum.ADMIN_PAY.getCode(),BillingStatusEnum.BILLING_INVOICING_REJECTION.getCode(),getMonth()); List<CardDO> moneyByUserIds = cardMapper.getMoneyByUserIds(createReqVO.getOrderId(), CardDO.ADD, CostTypeEnum.ADMIN_PAY.getCode(),BillingStatusEnum.BILLING_INVOICING_REJECTION.getCode(),getMonth(),createReqVO.getUserId());
if(CollUtil.isEmpty(moneyByUserIds))throw exception(BILLING_NOT_ORDER_EXISTS); if(CollUtil.isEmpty(moneyByUserIds))throw exception(BILLING_NOT_ORDER_EXISTS);
BigDecimal totalMoney = moneyByUserIds.stream() BigDecimal totalMoney = moneyByUserIds.stream()
.map(CardDO::getChangeMoney) .map(CardDO::getChangeMoney)
@ -456,9 +456,9 @@ public class BillingServiceImpl implements BillingService {
response.setMothMoney(new BigDecimal(0)); response.setMothMoney(new BigDecimal(0));
return response; return response;
} }
BigDecimal moneyByUserIds = cardMapper.getTotalMoneyByuserIds(memberList, CardDO.ADD, CostTypeEnum.ADMIN_PAY.getCode(),getMonth()); BigDecimal moneyByUserIds = cardMapper.getTotalMoneyByuserIds(memberList, CardDO.ADD, CostTypeEnum.ADMIN_PAY.getCode(),getMonth(),userId);
int i = DateUtil.date().monthBaseOne(); int i = DateUtil.date().monthBaseOne();
BigDecimal month = cardMapper.getTotalMoneyByuserIds(memberList, CardDO.ADD, CostTypeEnum.ADMIN_PAY.getCode(),i); BigDecimal month = cardMapper.getTotalMoneyByuserIds(memberList, CardDO.ADD, CostTypeEnum.ADMIN_PAY.getCode(),i,userId);
response.setWithoutMoney(moneyByUserIds); response.setWithoutMoney(moneyByUserIds);
response.setMothMoney(month); response.setMothMoney(month);
return response; return response;
@ -594,7 +594,7 @@ public class BillingServiceImpl implements BillingService {
if(CollUtil.isEmpty(ids)){ if(CollUtil.isEmpty(ids)){
return new BigDecimal(0); return new BigDecimal(0);
} }
List<CardDO> moneyByUserIds = cardMapper.getMoneyByUserIds(ids, CardDO.ADD, CostTypeEnum.ADMIN_PAY.getCode(), BillingStatusEnum.BILLING_INVOICING_REJECTION.getCode(),getMonth()); List<CardDO> moneyByUserIds = cardMapper.getMoneyByUserIds(ids, CardDO.ADD, CostTypeEnum.ADMIN_PAY.getCode(), BillingStatusEnum.BILLING_INVOICING_REJECTION.getCode(),getMonth(),vo.getUserId());
return moneyByUserIds.stream() return moneyByUserIds.stream()
.map(CardDO::getChangeMoney) .map(CardDO::getChangeMoney)
.filter(Objects::nonNull) .filter(Objects::nonNull)