java/qijisheng.git

			@@ -53,6 +53,19 @@
			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) {
			if (changeRecord.getBeforeAmount()!=null && changeRecord.getAfterAmount()!=null){
			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);
			}
			@@ -62,18 +75,6 @@
			ShopBalanceStatement shopBalanceStatement = new ShopBalanceStatement();
			shopBalanceStatement.setType(1);

			R<List<ShopBalanceStatement>> r;
			try {
			r = shopClient.getShopBalanceStatementList(shopBalanceStatement);
			} catch (Exception e) {
			log.error("获取店铺余额对账单列表时出错", e);
			return null;
			}

			if (R.isError(r)) {
			return null;
			}

			List<BalanceChangeRecord> balanceChangeRecordList = this.baseMapper.selectBalanceChangeRecordList(balanceChangeRecord);
			List<WalletStatisticsDetail> walletStatisticsDetailList = new ArrayList<>();
			for (BalanceChangeRecord changeRecord : balanceChangeRecordList) {
			@@ -82,24 +83,6 @@
			walletStatisticsDetailList.add(walletStatisticsDetail);
			}

			List<WalletStatisticsDetail> collect = r.getData().stream().map(this::createWalletStatisticsDetail).collect(Collectors.toList());
			// 根据门店名称、用户姓名、联系电话进行模糊过滤
			collect = collect.stream()
			.filter(e -> {
			if (StringUtils.isNotEmpty(balanceChangeRecord.getShopName())) {
			return e.getShopName().contains(balanceChangeRecord.getShopName());
			} else if (StringUtils.isNotEmpty(balanceChangeRecord.getUserName())) {
			return e.getUserName().contains(balanceChangeRecord.getUserName());
			} else if (StringUtils.isNotEmpty(balanceChangeRecord.getUserPhone())) {
			return e.getUserPhone().contains(balanceChangeRecord.getUserPhone());
			}
			// 根据时间进行范围过滤
			if (balanceChangeRecord.getStartTime() != null && balanceChangeRecord.getEndTime() != null) {
			return e.getCreateTime().isAfter(balanceChangeRecord.getStartTime()) && e.getCreateTime().isBefore(balanceChangeRecord.getEndTime());
			}
			return false;
			}).collect(Collectors.toList());
			walletStatisticsDetailList.addAll(collect);

			// 按时间排序（倒序）
			walletStatisticsDetailList.sort(Comparator.comparing(WalletStatisticsDetail::getCreateTime).reversed());
			@@ -112,12 +95,13 @@
			int fromIndex = (int) ((current - 1) * size);
			int toIndex = (int) Math.min(fromIndex + size, walletStatisticsDetailList.size());


			Page<WalletStatisticsDetail> walletStatisticsDetailPage = new Page<>();
			WalletStatistics walletStatistics = new WalletStatistics();
			if (fromIndex >= walletStatisticsDetailList.size()) {
			throw new ServiceException("页面参数无效");
			walletStatistics.setPage(walletStatisticsDetailPage);
			return walletStatistics;
			}

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


			Map<Integer, BigDecimal> shopCommissionMap = walletStatisticsDetailList.stream()
			.collect(Collectors.groupingBy(
			@@ -133,29 +117,17 @@
			BigDecimal totalWithdraw = shopCommissionMap.get(2);
			BigDecimal totalShopWithdraw = shopCommissionMap.get(7);

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

			WalletStatistics walletStatistics = new WalletStatistics();
			Page<WalletStatisticsDetail> page1 = new Page<>();
			page1.setRecords(walletStatisticsDetailList2);
			page1.setTotal(walletStatisticsDetailList.size());
			page1.setCurrent(current);
			page1.setSize(size);
			walletStatistics.setPage(page1);
			walletStatisticsDetailPage.setCurrent(current);
			walletStatisticsDetailPage.setSize(size);
			walletStatisticsDetailPage.setTotal(walletStatisticsDetailList.size());
			walletStatisticsDetailPage.setRecords(walletStatisticsDetailList2);
			walletStatistics.setPage(walletStatisticsDetailPage);
			walletStatistics.setTotalRecharge(totalRecharge);
			walletStatistics.setTotalWithdraw(totalWithdraw);
			walletStatistics.setTotalShopWithdraw(totalShopWithdraw);
			return walletStatistics;
			}

			private WalletStatisticsDetail createWalletStatisticsDetail(ShopBalanceStatement item) {
			WalletStatisticsDetail walletStatisticsDetail = new WalletStatisticsDetail();
			walletStatisticsDetail.setShopName(item.getShopName());
			walletStatisticsDetail.setUserName(item.getShopManagerName());
			walletStatisticsDetail.setUserPhone(item.getPhone());
			walletStatisticsDetail.setChangeType(4);
			walletStatisticsDetail.setCreateTime(item.getCreateTime());
			walletStatisticsDetail.setChangeAmount(item.getVariableAmount());
			return walletStatisticsDetail;
			}

			}