From b83a7d0a9249e74ee337cc5ef2a97d1a100e08fe Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 25 七月 2025 20:11:46 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
index c8a2f2e..2cf0526 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
+++ b/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();
}
--
Gitblit v1.7.1