1、团长团员模块修复

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/teambuyController/LeaderController.java

@@ -76,4 +76,11 @@ public class LeaderController {
         return leaderService.queryLeaderList(pageBean);
     }
 
+    //查询绑定团长信息
+    @ApiOperation(value="我的-查询绑定团长信息(默认下单地址)", notes="我的-查询绑定团长信息(默认下单地址)")
+    @RequestMapping(value = "/queryMyLeader", method = {RequestMethod.GET})
+    public Result<?> queryMyLeader(@RequestHeader("X-Access-Token") String token){
+        return leaderService.queryMyLeader(token);
+    }
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/LeaderService.java

@@ -24,4 +24,6 @@ public interface LeaderService {
     public Result<?> queryMemberList(String token, PageBean pageBean);
     //查询团长列表
     public Result<?> queryLeaderList(PageBean pageBean);
+    //查询绑定团长信息
+    public Result<?> queryMyLeader(String token);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CouponServiceImpl.java

@@ -33,7 +33,7 @@ public class CouponServiceImpl implements CouponService {
     public Result<?> queryCouponList(String token, TeambuyCouponUser teambuyCouponUser, PageBean pageBean) {
         //权限验证
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
-        //HanHaiMember hanHaiMember = hanHaiMemberService.getById("1898983659468853250");
+        //HanHaiMember hanHaiMember = hanHaiMemberService.getById("1919587097244078081");
         //返回信息
         String massege = "";
         //分页信息

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/LeaderServiceImpl.java

@@ -115,16 +115,18 @@ public class LeaderServiceImpl implements LeaderService {
     @Override
     public Result<?> deleteLeader(String token, TeambuyTeamRelation teamRelation) {
         //权限验证
-        //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
-        HanHaiMember hanHaiMember = hanHaiMemberService.getById("1898983659468853250");
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //HanHaiMember hanHaiMember = hanHaiMemberService.getById("1919587097244078081");
         //返回信息
         String massege = "";
 
+
+
         try{
             //解绑团长
             boolean result = teambuyTeamRelationService
                     .lambdaUpdate()
-                    .eq(TeambuyTeamRelation::getMemberId, teamRelation.getMemberId())
+                    .eq(TeambuyTeamRelation::getMemberId, hanHaiMember.getId())
                     .eq(TeambuyTeamRelation::getLeaderId, teamRelation.getLeaderId())
                     .set(TeambuyTeamRelation::getStatus, "0")
                     .update();
@@ -169,7 +171,7 @@ public class LeaderServiceImpl implements LeaderService {
             //更换团长
             boolean result = teambuyTeamRelationService
                     .lambdaUpdate()
-                    .eq(TeambuyTeamRelation::getMemberId, teamRelation.getMemberId())
+                    .eq(TeambuyTeamRelation::getMemberId, relation.getMemberId())
                     .set(TeambuyTeamRelation::getLeaderId, teamRelation.getLeaderId())
                     .set(TeambuyTeamRelation::getStatus, "1")
                     .update();
@@ -213,6 +215,7 @@ public class LeaderServiceImpl implements LeaderService {
     public Result<?> queryMemberList(String token, PageBean pageBean) {
         //权限验证
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //HanHaiMember hanHaiMember = hanHaiMemberService.getById("1919587097244078081");
         //返回信息
         String massege = "";
         //分页信息
@@ -223,13 +226,22 @@ public class LeaderServiceImpl implements LeaderService {
         Page<TeambuyTeamRelation> pageList = null;
 
         try{
+            //团长信息
+            TeambuyTeamLeader teamLeader = teambuyTeamLeaderService
+                    .lambdaQuery()
+                    .eq(TeambuyTeamLeader::getUserId, hanHaiMember.getId())
+                    .one();
+            if(null == teamLeader || !"1".equals(teamLeader.getStatus())){
+                return Result.error("你还没有成为团长");
+            }
+
             //分页
             page = new Page<TeambuyTeamRelation>(pageBean.getPageNo(), pageBean.getPageSize());
             query = teambuyTeamRelationService
                     .lambdaQuery();
 
             //团长id
-            query.eq(TeambuyTeamRelation::getLeaderId, hanHaiMember.getId());
+            query.eq(TeambuyTeamRelation::getLeaderId, teamLeader.getId());
             //按照排序编号升序排列
             query.orderByDesc(TeambuyTeamRelation::getCreateTime);
 
@@ -238,7 +250,6 @@ public class LeaderServiceImpl implements LeaderService {
 
             for (TeambuyTeamRelation record : pageList.getRecords()) {
                 //团长信息
-                TeambuyTeamLeader teamLeader = teambuyTeamLeaderService.getById(record.getLeaderId());
                 record.setTeamLeader(teamLeader);
 
                 //团员信息
@@ -283,4 +294,33 @@ public class LeaderServiceImpl implements LeaderService {
             return Result.error("团长列表查询失败");
         }
     }
+
+    //查询绑定团长信息
+    @Override
+    public Result<?> queryMyLeader(String token) {
+        //权限验证
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //HanHaiMember hanHaiMember = hanHaiMemberService.getById("1919587097244078081");
+        //返回信息
+        String massege = "";
+
+        try{
+            //获取我的团长
+            TeambuyTeamRelation relation = teambuyTeamRelationService
+                    .lambdaQuery()
+                    .eq(TeambuyTeamRelation::getMemberId, hanHaiMember.getId())
+                    .one();
+
+            //获取团长信息
+            TeambuyTeamLeader one = teambuyTeamLeaderService
+                    .lambdaQuery()
+                    .eq(TeambuyTeamLeader::getId, relation.getLeaderId())
+                    .one();
+
+            return Result.OK("绑定团长信息详情", one);
+        }catch (Exception e){
+            e.printStackTrace();
+            return Result.error("绑定团长信息详情查询失败");
+        }
+    }
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserInfoServiceImpl.java

@@ -8,6 +8,10 @@ import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
 import org.jeecg.modules.teambuyLevel.entity.TeambuyLevel;
 import org.jeecg.modules.teambuyLevel.service.ITeambuyLevelService;
+import org.jeecg.modules.teambuyTeamLeader.entity.TeambuyTeamLeader;
+import org.jeecg.modules.teambuyTeamLeader.service.ITeambuyTeamLeaderService;
+import org.jeecg.modules.teambuyTeamRelation.entity.TeambuyTeamRelation;
+import org.jeecg.modules.teambuyTeamRelation.service.ITeambuyTeamRelationService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -26,6 +30,12 @@ public class UserInfoServiceImpl implements UserInfoService {
     //佣金等级信息
     @Resource
     private ITeambuyLevelService teambuyLevelService;
+    //团长团员关联
+    @Resource
+    private ITeambuyTeamRelationService teambuyTeamRelationService;
+    //团长信息
+    @Resource
+    private ITeambuyTeamLeaderService teambuyTeamLeaderService;
     /******************************************************************************************************************/
 
     //查询个人信息
@@ -93,6 +103,17 @@ public class UserInfoServiceImpl implements UserInfoService {
             TeambuyLevel level = teambuyLevelService.getById(hanHaiMember.getLeaderLevelId());
             map.put("level",level);
 
+            //我的团长
+            TeambuyTeamRelation relation = teambuyTeamRelationService
+                    .lambdaQuery()
+                    .eq(TeambuyTeamRelation::getMemberId, hanHaiMember.getId())
+                    .one();
+            TeambuyTeamLeader teamLeader = null;
+            if(null != relation){
+                teamLeader = teambuyTeamLeaderService.getById(relation.getLeaderId());
+            }
+            map.put("teamLeader", teamLeader);
+
             //推广佣金
             //优惠券