1、修改app第三方登录

.gitignore

@@ -21,7 +21,6 @@ build/
 *.ipr
 *.iml
 *.iws
-*.yml
 *.jar
 
 # temp ignore

sptg-estate/sptg-estate-api/src/main/java/com/sptg/estate/api/feigns/MemberFeign.java

@@ -30,6 +30,9 @@ public interface MemberFeign {
      */
     @PostMapping(value = "/member/getMemberByOpenid")
     ResultBean<Member> getMemberByOpenid(@RequestBody MemberDto memberDto);
+
+    @PostMapping(value = "/member/getMemberById")
+    ResultBean<Member> getMemberById(@RequestBody MemberDto memberDto);
     /**
      * 功能描述: 会员注册
      * @param member

sptg-estate/sptg-estate-api/src/main/java/com/sptg/estate/api/feigns/fallback/MemberFeignFallbackFactory.java

@@ -32,6 +32,12 @@ public class MemberFeignFallbackFactory implements FallbackFactory<MemberFeign>
                 return new ResultBean<>(ResultEnum.ERROR);
             }
 
+            @Override
+            public ResultBean<Member> getMemberById(MemberDto memberDto) {
+                log.error(cause.getMessage(),cause);
+                return new ResultBean<>(ResultEnum.ERROR);
+            }
+
             @Override
             public ResultBean<Boolean> memberRegister(Member member) {
                 log.error(ResultEnum.ERROR.getCode(),cause);

sptg-estate/sptg-estate-biz/src/main/java/com/sptg/estate/biz/controller/MemberController.java

@@ -40,6 +40,12 @@ public class MemberController implements MemberFeign {
         return memberServiceInterface.getMemberByOpenid(memberDto);
     }
 
+    @Override
+    @PostMapping(value = "/member/getMemberById")
+    public ResultBean<Member> getMemberById(@RequestBody MemberDto memberDto) {
+        return memberServiceInterface.getMemberById(memberDto);
+    }
+
     @Override
     @PostMapping(value = "/member/memberRegister")
     public ResultBean<Boolean> memberRegister(@RequestBody Member member) {

sptg-estate/sptg-estate-biz/src/main/java/com/sptg/estate/biz/service/MemberServiceInterface.java

@@ -29,6 +29,15 @@ public interface MemberServiceInterface extends IService<Member> {
      *                      
      */
     ResultBean<Member> getMemberByOpenid(MemberDto memberDto);
+
+    /**
+     * 功能描述:根据Id获取会员信息
+     * @param  memberDto
+     * @return
+     *
+     *
+     */
+    ResultBean<Member> getMemberById(MemberDto memberDto);
     /**
      * 功能描述:会员注册
      * @param member

sptg-estate/sptg-estate-biz/src/main/java/com/sptg/estate/biz/service/impl/MemberServiceImpl.java

@@ -66,6 +66,18 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> impleme
         return new ResultBean<>(ResultEnum.SUCCESS,this.selectOne(wrapper));
     }
 
+    @Override
+    public ResultBean<Member> getMemberById(MemberDto memberDto) {
+        //构建查询条件
+        Wrapper<Member> wrapper = new EntityWrapper<>();
+        wrapper.eq("l_id", memberDto.getId());
+        //机构id
+        wrapper.eq("l_org_id",memberDto.getOrgId());
+        //数据状态   数据状态：{ -1：已删除，0：正常 }
+        wrapper.eq("i_status", OperationConstant.ZERO);
+        return new ResultBean<>(ResultEnum.SUCCESS,this.selectOne(wrapper));
+    }
+
     @Override
     @Transactional(rollbackFor = Throwable.class)
     public ResultBean<Boolean> memberRegister(Member member) {

sptg-gateway/sptg-app-gateway/src/main/java/com/sptg/gateway/controller/MimiProgramController.java

@@ -239,6 +239,61 @@ public class MimiProgramController {
         return hashMap;
     }
 
+    @PostMapping(value = "/getMemberById")
+    public Map<String,Object> getMemberById(@RequestBody Map<String,String> map){
+        log.warn("============================小程序通过微信openid获取会员(/app/miniprogram/getMemberById)请求数据==============================");
+        log.warn(JsonUtils.objectToJson(map));
+        Map<String,Object> hashMap = new HashMap<>();
+        //result_code:0-失败  1-成功
+        hashMap.put("result_code", 0);
+        hashMap.put("result_msg", "没有获取到相关会员信息");
+        try{
+            String org_id = map.get("org_id");
+            String memberId = map.get("memberId");
+            String token = map.get("token");
+            if(DataCheck.checkOrgId(hashMap, org_id, orgFeign)) {
+                return hashMap;
+            }
+            if(StringUtils.isBlank(memberId)){
+                hashMap.put("result_msg", "memberId不能为空");
+                return hashMap;
+            }
+            MemberDto memberDto = new MemberDto();
+            memberDto.setOrgId(Long.valueOf(org_id));
+            memberDto.setId(Long.valueOf(memberId));
+            ResultBean<Member> resultBean = this.memberFeign.getMemberById(memberDto);
+            Member member = resultBean.getData();
+            ApplyUserDto applyUserDto = new ApplyUserDto();
+            applyUserDto.setMemberId(member.getId());
+            boolean anyHousePass = false;
+            MemberAndUser memAndUser = new MemberAndUser();
+            memAndUser.setMemberId(member.getId());
+            List<MemberAndUser> memAndUserList = this.memberAndUserFeign.getByCondition(memAndUser);
+            if (memAndUserList != null && memAndUserList.size() > 0){
+                anyHousePass = true;
+            }
+            if(member!=null){
+                hashMap.put("result_code", 1);
+                hashMap.put("result_msg", "获取会员信息成功");
+                hashMap.put("member", PojoToApi.memberToApi(member));
+                hashMap.put("anyHousePass",anyHousePass);
+                //统计---会员登录
+                AppMemberLoginRecords a = new AppMemberLoginRecords();
+                a.setMemberId(member.getId());
+                //登录类型 0-小程序登录 1-app登录
+                a.setLoginType(OperationConstant.ZERO);
+                a.setLoginDate(new Date());
+                a.setRootOrgId(member.getRootOrgId());
+                a.setOrgPosition(member.getOrgPosition());
+                this.appMemberLoginRecordsFeign.addAppMemberLoginRecords(a);
+            }
+        }catch (Exception e){
+            log.error("异常", e);
+            hashMap.put("result_msg", "后台程序异常");
+        }
+        return hashMap;
+    }
+
     /**
      * 功能描述:会员注册--小程序
      * @param map {
@@ -454,7 +509,8 @@ public class MimiProgramController {
     public Map<String, Object> miniLogin(@PathVariable("source") String source, @RequestBody Map<String, String> requestMap) {
         AuthToken authToken = null;
         Map<String, Object> returnMap = new HashMap<>(1);
-        returnMap.put("errorMsg", "授权登录失败");
+        returnMap.put("result_msg", "授权登录失败");
+        returnMap.put("result_code", 0);
         if("CTWING".equals(source)){
             try {
                 // XXTea解密非公共加密参数
@@ -476,25 +532,23 @@ public class MimiProgramController {
                     Member memberByTel = this.memberFeign.findMemberByTel(checkMember);
                     ResultBean<Boolean> resultBean;
                     if (memberByTel == null) {
-                        Member newMember = new Member();
-                        newMember.setName(data.getUsername());
-                        newMember.setTel(accountOauthDto.getMobile());
-                        //create_type : 会员注册来源，0-小程序添加 1-后台添加  2-后台导入 3-app添加
-                        newMember.setCreateType(OperationConstant.FOUR);
-                        newMember.setCreateDate(new Date());
-                        //密码md5加密
-//                        member.setPassword(DigestUtils.md5Hex(PWD_SALT + password));
-                        newMember.setOrgId(1L);
-                        newMember.setRootOrgId(1L);
-                        newMember.setOrgPosition("0/1/");
-                        //新增会员--注册
-                        resultBean = this.memberFeign.memberRegister(newMember);
-                        if (resultBean.getCode().equals("200") && resultBean.getData()) {
-                            returnMap.put("result_code", 1);
-                            returnMap.put("result_msg", "授权登录成功");
-                        } else {
-                            returnMap.put("result_code", "授权登录异常");
-                        }
+                        returnMap.put("result_msg", "用户未注册");
+                        return returnMap;
+//                        Member newMember = new Member();
+//                        newMember.setTel(accountOauthDto.getMobile());
+//                        newMember.setCreateType(OperationConstant.FOUR);
+//                        newMember.setCreateDate(new Date());
+//                        newMember.setOrgId(1L);
+//                        newMember.setRootOrgId(1L);
+//                        newMember.setOrgPosition("0/1/");
+//                        //新增会员--注册
+//                        resultBean = this.memberFeign.memberRegister(newMember);
+//                        if (resultBean.getCode().equals("200") && resultBean.getData()) {
+//                            returnMap.put("result_code", 1);
+//                            returnMap.put("result_msg", "授权登录成功");
+//                        } else {
+//                            returnMap.put("result_code", "授权登录异常");
+//                        }
                     } else {
                         if (Integer.valueOf(OperationConstant.TWO).equals(memberByTel.getEnable())) {
                             returnMap.put("result_msg", "该账号已禁用");
@@ -511,7 +565,7 @@ public class MimiProgramController {
                             anyHousePass = true;
                         }
                         returnMap.put("result_code", 1);
-                        returnMap.put("result_msg", "登录成功");
+                        returnMap.put("result_msg", "授权登录成功");
                         if (StringUtils.isNotBlank(memberByTel.getHeadImage())) {
                             memberByTel.setHeadImage(confFeign.getFileServerHost() + memberByTel.getHeadImage());
                         }