12.18

luodangjia

2025-01-13 6b58e1804d8f34c5b17b694f6db0e3c161f15ad5

12.18

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java

@@ -43,10 +43,7 @@
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import java.util.stream.Stream;

import static com.sun.xml.internal.ws.api.model.wsdl.WSDLBoundOperation.ANONYMOUS.optional;
import static sun.plugin.util.ProgressMonitor.get;

/**
 * <p>

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/BalanceChangeRecordServiceImpl.java

@@ -82,24 +82,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());
@@ -145,17 +127,6 @@
        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;
    }

}

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/WalletStatisticsDetail.java

@@ -11,12 +11,6 @@

@Data
public class WalletStatisticsDetail {
    /**
     * 门店名称
     */
    @ApiModelProperty(value = "门店名称")
    @Excel(name = "门店名称")
    private String shopName;

    /**
     * 用户姓名