1

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

@@ -59,6 +59,8 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> impleme
         Wrapper<Member> wrapper = new EntityWrapper<>();
         //openid
         wrapper.eq("s_openid", memberDto.getOpenid());
+        //openid
+        wrapper.eq("l_id", memberDto.getId());
         //机构id
         wrapper.eq("l_org_id",memberDto.getOrgId());
         //数据状态   数据状态：{ -1：已删除，0：正常 }

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

@@ -509,8 +509,7 @@ 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("result_msg", "授权登录失败");
-        returnMap.put("result_code", 0);
+        returnMap.put("errorMsg", "授权登录失败");
         if("CTWING".equals(source)){
             try {
                 // XXTea解密非公共加密参数
@@ -532,23 +531,25 @@ public class MimiProgramController {
                     Member memberByTel = this.memberFeign.findMemberByTel(checkMember);
                     ResultBean<Boolean> resultBean;
                     if (memberByTel == null) {
-                        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", "授权登录异常");
-//                        }
+                        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", "授权登录异常");
+                        }
                     } else {
                         if (Integer.valueOf(OperationConstant.TWO).equals(memberByTel.getEnable())) {
                             returnMap.put("result_msg", "该账号已禁用");
@@ -565,7 +566,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());
                         }