puzhibing
5 天以前 b83a7d0a9249e74ee337cc5ef2a97d1a100e08fe
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
@@ -432,6 +432,16 @@
                merMemberPageDto.setSurpEndNum(999999999);
            }
        }
        //今日到店用户
        if(1 == merMemberPageDto.getIsTodayStore()){
            List<Integer> data = remoteOrderService.countShopServicePerson(merMemberPageDto.getShopId()).getData();
            merMemberPageDto.setUserIds(data);
        }
        //有未跟进的任务用户
        if(1 == merMemberPageDto.getIsTask()){
            List<Integer> data = remoteShopService.getMemberIngTotal(merMemberPageDto.getShopId()).getData();
            merMemberPageDto.setUserIds(data);
        }
        List<MerMemberPageVo> merMemberPageVoList = memberMapper.pageMerMember(page, merMemberPageDto);
        //处理活跃度返回
        if (merMemberPageVoList != null && !merMemberPageVoList.isEmpty()) {
@@ -950,7 +960,8 @@
            merMemberPageDto.setStartBirthday(startBirthday.format(formatter));
        }
        // 获取当前登陆人的可视权限
        SysUser sysUser = SecurityUtils.getSysUser();
        SysUser sysUserId = SecurityUtils.getSysUser();
        SysUser sysUser = sysUserService.getSysUser(sysUserId.getUserId()).getData();
        // 店铺ids
        List<Long> scope = new ArrayList<>();
        if (sysUser!=null){
@@ -2313,9 +2324,8 @@
            File file = wxMaService.getQrcodeService().createWxaCodeUnlimit(scene, path);
            FileInputStream input = new FileInputStream(file);
            MultipartFile multipartFile = new MyMultipartFile("file", file.getName(), "text/plain", IOUtils.toByteArray(input));
            SysFile sysFile = remoteFileService.upload(multipartFile).getData();
            return sysFile.getUrl();
            String data = remoteFileService.uploadOSS(multipartFile).getData();
            return data;
        } catch (Exception e) {
            e.printStackTrace();
        }