chuangte/smart-switch-java
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into dev

Browse Source
This commit is contained in:
磷叶 2025-01-04 20:43:50 +08:00
commit 6dbe881081
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
smart-switch-service/src/main/java/com/ruoyi/ss/store/service/impl/StoreAssemblerImpl.java
View File

@ -99,7 +99,7 @@ public class StoreAssemblerImpl implements StoreAssembler {
LocalDate now = LocalDate.now();
query.setGroupBy(TransactionBillGroupBy.store_id.name());
query.setStoreIds(list.stream().map(StoreVo::getStoreId).filter(Objects::nonNull).distinct().collect(Collectors.toList()));
query.setStatus(TransactionBillStatus.SUCCESS.getStatus());
query.setStatusList(TransactionBillStatus.payedOrder());
query.setType(TransactionBillType.RECHARGE.getType());
query.setMonth(now.getMonthValue());
query.setYear(now.getYear());
@ -129,7 +129,7 @@ public class StoreAssemblerImpl implements StoreAssembler {
TransactionBillQuery query = new TransactionBillQuery();
query.setGroupBy(TransactionBillGroupBy.store_id.name());
query.setStoreIds(list.stream().map(StoreVo::getStoreId).filter(Objects::nonNull).distinct().collect(Collectors.toList()));
query.setStatus(TransactionBillStatus.SUCCESS.getStatus());
query.setStatusList(TransactionBillStatus.payedOrder());
query.setType(TransactionBillType.RECHARGE.getType());
query.setCreateDate(DateUtils.getNowDate());
Map<Long, BillCountVo> map = transactionBillService.selectCountMap(query, BillCountVo::getStoreId);
@ -158,7 +158,7 @@ public class StoreAssemblerImpl implements StoreAssembler {
LocalDate lastMonth = LocalDate.now().plusMonths(-1);
query.setGroupBy(TransactionBillGroupBy.store_id.name());
query.setStoreIds(list.stream().map(StoreVo::getStoreId).filter(Objects::nonNull).distinct().collect(Collectors.toList()));
query.setStatus(TransactionBillStatus.SUCCESS.getStatus());
query.setStatusList(TransactionBillStatus.payedOrder());
query.setType(TransactionBillType.RECHARGE.getType());
query.setMonth(lastMonth.getMonthValue());
query.setYear(lastMonth.getYear());