修改统计bug和部分功能修改

Pu Zhibing

2025-03-26 cbf2486983b77a27af9968bbb362cb8d43789115

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

@@ -32,6 +32,7 @@
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;

/**
@@ -152,12 +153,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();
@@ -237,6 +237,7 @@
                                         @RequestParam Integer pageNum,
                                         Integer pageSize) {

        List<Integer> shopIds = new ArrayList<>();
        List<Long> userIds = new ArrayList<>();
        if (StringUtils.isNotEmpty(authName)){
            R<List<AppUser>> uR = appUserClient.getAppUserByName(authName);
@@ -245,7 +246,11 @@
                return R.ok(Page.of(pageNum, pageSize));
            }
            userIds.addAll(userList.stream().map(AppUser::getId).collect(Collectors.toList()));

            //门店名称
            Set<Integer> integers = shopClient.getShopIdByName(authName).getData();
            if(null != integers){
                shopIds.addAll(integers);
            }
        }
        if (StringUtils.isNotEmpty(authPhone)){
            R<List<AppUser>> uR = appUserClient.getAppUserByPhone(authPhone);
@@ -254,20 +259,15 @@
                return R.ok(Page.of(pageNum, pageSize));
            }
            userIds.addAll(userList.stream().map(AppUser::getId).collect(Collectors.toList()));
            //获取门店
            for (AppUser appUser : userList) {
                List<Shop> data = shopClient.getShopByUserId(appUser.getId()).getData();
                if(null != data && data.size() > 0){
                    shopIds.addAll(data.stream().map(Shop::getId).collect(Collectors.toList()));
                }
            }
        }



        Page<Share> page = shareService.lambdaQuery()
                .ne(Share::getAuditStatus, 1)
                .like(name != null, Share::getName, name)
                .eq(addType != null, Share::getAddType, addType)
                .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));
        Page<Share> page = shareService.authmanagelist(name, addType, auditStatus, userIds, shopIds, pageNum, pageSize);
        for (Share record : page.getRecords()) {
            if (record.getAddType() == 2) {
                AppUser appUserById = appUserClient.getAppUserById(Long.valueOf(record.getObjectId()));
@@ -316,27 +316,27 @@
            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);
                        userPoint.setHistoricalPoint(lavePoint);
                        userPoint.setVariablePoint(everySharePoint);
                        userPoint.setBalance(appUser.getLavePoint());
                        userPoint.setCreateTime(LocalDateTime.now());
                        userPoint.setAppUserId(appUser.getId());
                        userPoint.setChangeDirection(1);
                        userPointClient.saveUserPoint(userPoint);
                    }
                }
@@ -345,6 +345,13 @@
        }
        return R.ok(one);
    }

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

    
}