贵阳-积分商城
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
huliguo
2025-06-06 2474cec7f04390c196c0f7c753d4b70f1d53fcac 
 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserPointController.java


@@ -226,8 +226,8 @@


    public R<PageInfo<UserPointStatisticsPageVO>> getUserPointStatisticsPageList(@RequestParam(value = "types",required = false) Collection<Integer> types,


                                                                    @RequestParam(value = "name",required = false) String name,


                                                                    @RequestParam(value = "phone",required = false) String phone,


                                                                    @RequestParam(value = "beginTime",required = false) LocalDateTime beginTime,


                                                                    @RequestParam(value = "endTime",required = false) LocalDateTime endTime,


                                                                    @RequestParam(value = "beginTime",required = false)@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")  LocalDateTime beginTime,


                                                                    @RequestParam(value = "endTime",required = false)@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")  LocalDateTime endTime,


                                                                    @ApiParam("当前页")@RequestParam("pageCurr") Integer pageCurr,


                                                                    @ApiParam("分页大小")@RequestParam("pageSize") Integer pageSize) {


        //查找记录


@@ -243,8 +243,8 @@


    public R<UserPointStatisticsTopVO> getUserPointStatisticsTop(@RequestParam(value = "types",required = false) Collection<Integer> types,


                                                                      @RequestParam(value = "name",required = false) String name,


                                                                      @RequestParam(value = "phone",required = false) String phone,


                                                                      @RequestParam(value = "beginTime",required = false) LocalDateTime beginTime,


                                                                      @RequestParam(value = "endTime",required = false) LocalDateTime endTime


                                                                      @RequestParam(value = "beginTime",required = false)@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime beginTime,


                                                                      @RequestParam(value = "endTime",required = false)@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime endTime


                                                                     ) {


        UserPointStatisticsTopVO userPointStatisticsOutVO = new UserPointStatisticsTopVO();


        //充值绿电分


@@ -269,8 +269,8 @@


                        @RequestParam(value = "types",required = false) Collection<Integer> types,


                        @RequestParam(value = "name",required = false) String name,


                        @RequestParam(value = "phone",required = false) String phone,


                        @RequestParam(value = "beginTime",required = false) LocalDateTime beginTime,


                        @RequestParam(value = "endTime",required = false) LocalDateTime endTime){


                        @RequestParam(value = "beginTime",required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime beginTime,


                        @RequestParam(value = "endTime",required = false)@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")  LocalDateTime endTime){


        List<UserPointExcel> exportList =userPointMapper.userPointExcel(types,name,phone,beginTime,endTime);


        exportList.forEach(x->{


            if (x.getType()==12||x.getType()==17){