Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-20 49f2eff2cf52e0f1719dfad43cafff11b378252c

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/BalanceChangeRecordController.java

@@ -2,10 +2,14 @@

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.account.api.model.BalanceChangeRecord;
import com.ruoyi.account.dto.BalanceQuery;
import com.ruoyi.account.service.BalanceChangeRecordService;
import com.ruoyi.account.vo.CommissionDetail;
import com.ruoyi.account.vo.CommissionStatistics;
import com.ruoyi.account.vo.WalletStatistics;
import com.ruoyi.account.vo.WalletStatisticsDetail;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.poi.ExcelUtil;
import io.swagger.annotations.ApiOperation;
@@ -30,6 +34,7 @@
   
   /**
    * 保存账户流水记录
     *
    * @param balanceChangeRecord
    * @return
    */
@@ -57,6 +62,7 @@
      CommissionStatistics commissionStatistics1 = balanceChangeRecordService.commissionStatistics(Page.of(pageNum, pageSize), balanceChangeRecord);
      return R.ok(commissionStatistics1);
   }

//
//   /**
//    * 导出用户分佣统计
@@ -72,5 +78,29 @@
   }

   
    /**
     * 钱包统计
     */
    @GetMapping("/walletStatistics")
    @ApiOperation(value = "钱包统计", tags = "管理后台-财务统计-钱包统计")
    public R<WalletStatistics> walletStatistics(@ApiParam("页码") @RequestParam Integer pageNum,
                                                @ApiParam("每一页数据大小") Integer pageSize,
                                                BalanceChangeRecord balanceChangeRecord) {
        WalletStatistics walletStatistics = balanceChangeRecordService.walletStatistics(Page.of(pageNum, pageSize), balanceChangeRecord);
        return R.ok(walletStatistics);
    }

    /**
     * 钱包统计导出
     */
    @GetMapping("/walletExport")
    @ApiOperation(value = "钱包统计导出", tags = "管理后台-财务统计-钱包统计")
    public void walletExport(HttpServletResponse response, BalanceChangeRecord balanceChangeRecord) {
        WalletStatistics walletStatistics = balanceChangeRecordService.walletStatistics(Page.of(1, Integer.MAX_VALUE), balanceChangeRecord);
        IPage<WalletStatisticsDetail> userPointPage = walletStatistics.getPage();
        List<WalletStatisticsDetail> userPointList = userPointPage.getRecords();
        ExcelUtil<WalletStatisticsDetail> util = new ExcelUtil<>(WalletStatisticsDetail.class);
        util.exportExcel(response, userPointList, "钱包统计");
    }
   
}