From 02317e95a92ca41988f70b6ad78c9e9682c6b15c Mon Sep 17 00:00:00 2001
From: Aug <17674666882@163.com>
Date: Fri, 27 Dec 2024 15:37:29 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=B7=BB=E5=8A=A0=E6=8E=A8=E8=8D=90?=
=?UTF-8?q?=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/workspace.xml | 127 +++++++--------------
.../service/impl/AppletLoginServiceImpl.java | 3 +
.../api/carrentController/RecommendController.java | 2 +-
.../java/org/jeecg/modules/apiBean/WxQrCodeVo.java | 3 +
.../jeecg/modules/apiService/RecommendService.java | 7 ++
.../apiService/impl/RecommendServiceImpl.java | 46 ++++++++
6 files changed, 104 insertions(+), 84 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d5ea3d5..09dfc51 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,60 +3,12 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
+
-
@@ -195,7 +147,8 @@
-
+
+
1731385713383
@@ -267,7 +220,14 @@
1734431528564
-
+
+ 1735225242451
+
+
+
+ 1735225242451
+
+
@@ -297,7 +257,8 @@
-
+
+
@@ -316,62 +277,62 @@
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
@@ -380,10 +341,10 @@
-
+
-
+
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/AppletLoginServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/AppletLoginServiceImpl.java
index e6ab2d6..99fb7dd 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/AppletLoginServiceImpl.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/AppletLoginServiceImpl.java
@@ -74,6 +74,9 @@ public class AppletLoginServiceImpl implements AppletLoginService {
member.setAppletOpenid(wxOpenid);
member.setNickName(loginReq.getNickName());
member.setHeadImage(loginReq.getHeadimgurl());
+ if(null != loginReq.getShareId()){
+ member.setShareId(loginReq.getShareId());
+ }
// 生成token返回给小程序端
String token = JwtUtil.sign(member.getAppletOpenid(), wxOpenid);
memberService.save(member);
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/RecommendController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/RecommendController.java
index 2ff7505..1ff8d3c 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/RecommendController.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/RecommendController.java
@@ -32,7 +32,7 @@ public class RecommendController {
@ApiOperation(value="我的推荐-获取推荐用户信息", notes="我的推荐-获取推荐用户信息")
@RequestMapping(value = "/getInviteUser", method = {RequestMethod.GET})
public Result getInviteUser(@RequestHeader("X-Access-Token") String token){
- return recommendService.getInviteCode(token);
+ return recommendService.getInviteUser(token);
}
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/WxQrCodeVo.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/WxQrCodeVo.java
index 5dffd81..2da63da 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/WxQrCodeVo.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/WxQrCodeVo.java
@@ -11,4 +11,7 @@ public class WxQrCodeVo {
@ApiModelProperty(value = "小程序名称")
private String name;
+
+ @ApiModelProperty(value = "分享人id")
+ private String shareId;
}
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/RecommendService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/RecommendService.java
index ccc637e..b52d94d 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/RecommendService.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/RecommendService.java
@@ -11,4 +11,11 @@ public interface RecommendService {
*/
public Result getInviteCode(String token);
+ /**
+ * 获取个人推荐用户
+ * @param token
+ * @return
+ */
+ public Result getInviteUser(String token);
+
}
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/RecommendServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/RecommendServiceImpl.java
index 5ada6df..d2e6c72 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/RecommendServiceImpl.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/RecommendServiceImpl.java
@@ -14,6 +14,7 @@ import org.jeecg.modules.apiService.RecommendService;
import org.jeecg.modules.carrentConfig.entity.CarrentConfig;
import org.jeecg.modules.carrentConfig.service.ICarrentConfigService;
import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
+import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
import org.springframework.http.HttpMethod;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
@@ -25,7 +26,9 @@ import org.springframework.web.multipart.commons.CommonsMultipartFile;
import javax.annotation.Resource;
import java.io.*;
+import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
@Service
@@ -40,6 +43,10 @@ public class RecommendServiceImpl implements RecommendService {
@Resource
private ICarrentConfigService carrentConfigService;
+ //配置信息
+ @Resource
+ private IHanHaiMemberService hanHaiMemberService;
+
private String appid = "wx1c95690b8180a150";//小程序appid
private String secret = "7a686fb5308cca9ac0bc8cab14130cee";//小程序密钥
private String endpoint = "oss-cn-guangzhou.aliyuncs.com";
@@ -47,7 +54,45 @@ public class RecommendServiceImpl implements RecommendService {
private String secretKey = "XxExGallsV4O9nERHpVsQg2XtPCU7r";
private String bucketName = "augcl";
private String staticDomain = "https://img.augcl.com/";
+
/*************************************************************************************/
+ @Override
+ public Result getInviteUser(String token){
+ //权限验证
+ HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+ //返回信息
+ String message = "";
+ //返回数据
+ Map map = new HashMap<>();
+
+ try{
+ //获取直推用户
+ List directUserList = hanHaiMemberService
+ .lambdaQuery()
+ .eq(HanHaiMember::getShareId, hanHaiMember.getId())
+ .list();
+ map.put("directUserList", directUserList);
+
+ //获取间推用户
+ List ids = new ArrayList<>();
+ for (HanHaiMember member : directUserList) {
+ ids.add(member.getId());
+ }
+ List indirectUserList = hanHaiMemberService
+ .lambdaQuery()
+ .in(HanHaiMember::getShareId, ids)
+ .list();
+ map.put("indirectUserList", indirectUserList);
+
+ return Result.OK(message, map);
+
+ }catch (Exception e){
+ e.printStackTrace();
+ return Result.OK(message, map);
+ }
+
+ }
+
//获取个人推荐二维码
@Override
@@ -142,6 +187,7 @@ public class RecommendServiceImpl implements RecommendService {
WxQrCodeVo wxCodeVo = new WxQrCodeVo();
wxCodeVo.setUrl(staticDomain+this.uploadAliYunOss(mf));
wxCodeVo.setName("老环卫欢迎您");
+ wxCodeVo.setShareId(hanHaiMember.getId());
return Result.OK(wxCodeVo);