java/qijisheng.git

			@@ -53,6 +53,17 @@
			IPage<BalanceChangeRecord> balanceChangeRecordIPage = this.baseMapper.queryCommissionStatistics(page, balanceChangeRecord);
			// 过滤商城购物
			List<BalanceChangeRecord> collect = balanceChangeRecordIPage.getRecords().stream().filter(e -> e.getChangeType() != 5).collect(Collectors.toList());
			for (BalanceChangeRecord changeRecord : collect) {
			BigDecimal subtract = changeRecord.getBeforeAmount().subtract(changeRecord.getAfterAmount());
			if (subtract.compareTo(BigDecimal.ZERO)>0){
			// 减少
			changeRecord.setChangeAmountString("-￥"+changeRecord.getChangeAmount());
			}else if (subtract.compareTo(BigDecimal.ZERO)<0){
			changeRecord.setChangeAmountString("+￥"+changeRecord.getChangeAmount());
			}else{
			changeRecord.setChangeAmountString("￥"+changeRecord.getChangeAmount());
			}
			}
			balanceChangeRecordIPage.setRecords(collect);
			return new CommissionStatistics(totalCommission, balanceChangeRecordIPage);
			}
			@@ -82,10 +93,13 @@
			int fromIndex = (int) ((current - 1) * size);
			int toIndex = (int) Math.min(fromIndex + size, walletStatisticsDetailList.size());

			if (fromIndex >= walletStatisticsDetailList.size()) {
			throw new ServiceException("页面参数无效");
			}

			Page<WalletStatisticsDetail> walletStatisticsDetailPage = new Page<>();
			WalletStatistics walletStatistics = new WalletStatistics();
			if (fromIndex >= walletStatisticsDetailList.size()) {
			walletStatistics.setPage(walletStatisticsDetailPage);
			return walletStatistics;
			}

			Map<Integer, BigDecimal> shopCommissionMap = walletStatisticsDetailList.stream()
			.collect(Collectors.groupingBy(
			@@ -103,8 +117,6 @@

			List<WalletStatisticsDetail> walletStatisticsDetailList2 = walletStatisticsDetailList.subList(fromIndex, toIndex);

			WalletStatistics walletStatistics = new WalletStatistics();
			Page<WalletStatisticsDetail> walletStatisticsDetailPage = new Page<>();
			walletStatisticsDetailPage.setCurrent(current);
			walletStatisticsDetailPage.setSize(size);
			walletStatisticsDetailPage.setTotal(walletStatisticsDetailList.size());