From f6ba5de2578c58a738f35b29a708c523ccb518ba Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 05 十二月 2024 09:20:07 +0800
Subject: [PATCH] 最新版本541200007

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java |   98 ++++++++++++++++++++++++++++++++----------------
 1 files changed, 65 insertions(+), 33 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index a2446bb..cb86390 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -1697,6 +1697,7 @@
     /**
      * 寰俊鎺堟潈鎺ュ彛
      * @param code
+     * 鏉ユ簮:0=鍙告満锛�1=璁垮锛�2=鍐呴儴鍛樺伐
      * @return
      */
     @Override
@@ -1716,42 +1717,73 @@
 //        String openId = "12345";
         WxAuthorizeVO wxAuthorizeVO = new WxAuthorizeVO();
         wxAuthorizeVO.setOpenid(openId);
-        //鏍规嵁openId 鏌ヨ鐢ㄦ埛淇℃伅
-        Member member = memberJoinMapper.selectJoinOne(Member.class,new MPJLambdaWrapper<Member>()
-                .selectAll(Member.class)
-                .selectAs(Company::getName,Member::getCompanyName)
-                .leftJoin(Company.class,Company::getId,Member::getCompanyId)
-                .eq(Member::getOpenid,openId)
-                .eq(Member::getType,source)
-                .eq(Member::getIsdeleted,Constants.ZERO)
-                .orderByDesc(Member::getCreateDate)
-                .last(" limit 1 ")
-        );
-        //闈炶瀹㈢敤鎴� 杩涜鍒ゆ柇鏄惁瀛樺湪鐢ㄦ埛
-        if(!Objects.isNull(member)){
-            if(member.getIsdeleted() == Constants.ONE){
-                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸插垹闄�,璇疯仈绯荤鐞嗗憳");
-            }
-            if(member.getStatus() != Constants.ZERO){
-                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸茬鐢�,璇疯仈绯荤鐞嗗憳");
-            }
-            if(StringUtils.isNotBlank(member.getIdcardNo())){
-               member.setIdcardDecode(DESUtil.decrypt(Constants.EDS_PWD, member.getIdcardNo()));
-            }
-            String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() +
-                    systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
-            member.setPrefixUrl(prefixUrl);
-            wxAuthorizeVO.setMember(member);
-            //鍙告満 涓� 鍐呴儴浜哄憳 鎻愪緵token
-            if(Constants.equalsInteger(source,Constants.ZERO)||Constants.equalsInteger(source,Constants.TWO)){
-                SystemUser systemUser = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda().eq(SystemUser::getMemberId,member.getId())
-                        .eq(SystemUser::getStatus,Constants.ZERO).last(" limit 1 "));
-                if(Objects.nonNull(systemUser)){
-                    String token = systemLoginService.loginByUserId(systemUser.getId());
-                    wxAuthorizeVO.setToken(token);
+        if(source==1){
+            //鏍规嵁openId 鏌ヨ鐢ㄦ埛淇℃伅
+            Member member = memberJoinMapper.selectJoinOne(Member.class,new MPJLambdaWrapper<Member>()
+                    .selectAll(Member.class)
+                    .selectAs(Company::getName,Member::getCompanyName)
+                    .leftJoin(Company.class,Company::getId,Member::getCompanyId)
+                    .eq(Member::getOpenid,openId)
+                    .eq(Member::getType,source)
+                    .eq(Member::getIsdeleted,Constants.ZERO)
+                    .orderByDesc(Member::getCreateDate)
+                    .last(" limit 1 ")
+            );
+            //闈炶瀹㈢敤鎴� 杩涜鍒ゆ柇鏄惁瀛樺湪鐢ㄦ埛
+            if(!Objects.isNull(member)){
+                if(member.getIsdeleted() == Constants.ONE){
+                    throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸插垹闄�,璇疯仈绯荤鐞嗗憳");
+                }
+                if(member.getStatus() != Constants.ZERO){
+                    throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸茬鐢�,璇疯仈绯荤鐞嗗憳");
+                }
+                if(StringUtils.isNotBlank(member.getIdcardNo())){
+                    member.setIdcardDecode(DESUtil.decrypt(Constants.EDS_PWD, member.getIdcardNo()));
+                }
+                String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() +
+                        systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
+                member.setPrefixUrl(prefixUrl);
+                wxAuthorizeVO.setMember(member);
+                //鍙告満 涓� 鍐呴儴浜哄憳 鎻愪緵token
+                if(Constants.equalsInteger(source,Constants.ZERO)||Constants.equalsInteger(source,Constants.TWO)){
+                    SystemUser systemUser = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda().eq(SystemUser::getMemberId,member.getId())
+                            .eq(SystemUser::getStatus,Constants.ZERO).last(" limit 1 "));
+                    if(Objects.nonNull(systemUser)){
+                        String token = systemLoginService.loginByUserId(systemUser.getId());
+                        wxAuthorizeVO.setToken(token);
+                    }
                 }
             }
+        }else{
+            //濡傛灉鏄徃鏈烘垨鑰呭唴閮ㄤ汉鍛橈紝鍒欎粠system_user鏌ヨ
+            SystemUser user = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
+                    .eq(SystemUser::getOpenid,openId)
+                    .eq(SystemUser::getType,source)
+                    .eq(SystemUser::getDeleted,Boolean.FALSE)
+                    .last(" limit 1 "));
+            //闈炶瀹㈢敤鎴� 杩涜鍒ゆ柇鏄惁瀛樺湪鐢ㄦ埛
+            if(!Objects.isNull(user)){
+                Member member = memberMapper.selectById(user.getId());
+                if(member.getIsdeleted() == Constants.ONE){
+                    throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸插垹闄�,璇疯仈绯荤鐞嗗憳");
+                }
+                if(member.getStatus() != Constants.ZERO){
+                    throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸茬鐢�,璇疯仈绯荤鐞嗗憳");
+                }
+                if(StringUtils.isNotBlank(member.getIdcardNo())){
+                    member.setIdcardDecode(DESUtil.decrypt(Constants.EDS_PWD, member.getIdcardNo()));
+                }
+                String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() +
+                        systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
+                member.setPrefixUrl(prefixUrl);
+                wxAuthorizeVO.setMember(member);
+                //鍙告満 涓� 鍐呴儴浜哄憳 鎻愪緵token
+                String token = systemLoginService.loginByUserId(user.getId());
+                wxAuthorizeVO.setToken(token);
+            }
         }
+
+
         return wxAuthorizeVO;
     }
 

--
Gitblit v1.9.3