修改统计bug

Pu Zhibing

2025-03-18 eb428cb6839049970e67264f4eafc612e5bcaa38

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java

@@ -152,12 +152,11 @@
        if(sysUser.getRoleType() == 2){
            share.setObjectId(sysUser.getObjectId().longValue());
        }
//        if (sysUser.getRoleType() == 1){
//            share.setAuditStatus(ShareAuditStatus.SUCCESS.getCode());
//        }else{
//            share.setAuditStatus(ShareAuditStatus.WAIT.getCode());
//        }
        share.setAuditStatus(ShareAuditStatus.WAIT.getCode());
        if (sysUser.getRoleType() == 1){
            share.setAuditStatus(ShareAuditStatus.SUCCESS.getCode());
        }else{
            share.setAuditStatus(ShareAuditStatus.WAIT.getCode());
        }
        share.setDelFlag(0);
        shareService.save(share);
        return R.ok();
@@ -256,6 +255,16 @@
            userIds.addAll(userList.stream().map(AppUser::getId).collect(Collectors.toList()));
        }

        List<Share> list = shareService.list();
        if (CollectionUtils.isEmpty(list)){
            return R.ok(Page.of(pageNum, pageSize));
        }
        List<Long> objectIds = list.stream().map(Share::getObjectId).distinct().collect(Collectors.toList());
        List<AppUser> appUsers = appUserClient.listByIds(objectIds);
        List<Long> appUserIds = appUsers.stream().filter(item -> !item.getDelFlag()).map(AppUser::getId).collect(Collectors.toList());
        if (CollectionUtils.isEmpty(userIds)){
            userIds = appUserIds;
        }


        Page<Share> page = shareService.lambdaQuery()
@@ -265,7 +274,6 @@
                .eq(auditStatus != null, Share::getAuditStatus, auditStatus)
                .in(!CollectionUtils.isEmpty(userIds),Share::getObjectId, userIds)
                .eq(Share::getDelFlag, 0)
                .orderByAsc(Share::getAuditStatus)
                .orderByDesc(Share::getCreateTime)
                .page(Page.of(pageNum, pageSize));
        for (Share record : page.getRecords()) {
@@ -316,19 +324,20 @@
            Boolean data = userPointClient.judgmentDailyShare(userid).getData();
            if(!data){
                AppUser appUser = appUserClient.getAppUserById(userid);
                PointSetting pointSetting = pointSettingService.getOne(new LambdaQueryWrapper<PointSetting>().eq(PointSetting::getId, appUser.getVipId()).eq(PointSetting::getDelFlag, 0));
                PointSetting pointSetting = pointSettingService.getOne(new LambdaQueryWrapper<PointSetting>()
                        .eq(PointSetting::getId, appUser.getVipId()).eq(PointSetting::getDelFlag, 0));
                if(null != pointSetting){
                    Integer everySharePoint = pointSetting.getEverySharePoint();
                    Integer lavePoint = appUser.getLavePoint();
                    appUser.setTotalSharePoint(appUser.getTotalSharePoint() + everySharePoint);
                    appUser.setLavePoint(appUser.getLavePoint() + everySharePoint);
                    appUser.setAvailablePoint(appUser.getAvailablePoint() + everySharePoint);
                    appUser.setTransferablePoint(appUser.getTransferablePoint() + everySharePoint);
                    appUser.setTotalAvailablePoint(appUser.getTotalAvailablePoint() + everySharePoint);
                    appUser.setTotalPoint(appUser.getTotalPoint() + everySharePoint);
                    appUserClient.editAppUserById(appUser);
                    //添加积分流水
                    if(everySharePoint > 0){
                        Integer lavePoint = appUser.getLavePoint();
                        appUser.setTotalSharePoint(appUser.getTotalSharePoint() + everySharePoint);
                        appUser.setLavePoint(appUser.getLavePoint() + everySharePoint);
                        appUser.setAvailablePoint(appUser.getAvailablePoint() + everySharePoint);
                        appUser.setTransferablePoint(appUser.getTransferablePoint() + everySharePoint);
                        appUser.setTotalAvailablePoint(appUser.getTotalAvailablePoint() + everySharePoint);
                        appUser.setTotalPoint(appUser.getTotalPoint() + everySharePoint);
                        appUserClient.editAppUserById(appUser);
                        //添加积分流水
                        UserPoint userPoint = new UserPoint();
                        userPoint.setAppUserId(userid);
                        userPoint.setType(4);
@@ -345,6 +354,13 @@
        }
        return R.ok(one);
    }

    //appUserShare/
    @GetMapping("/saveAppUserShare")
    public R<Share> saveAppUserShare() {
        return getAppletShare();
    }

    
}