From 8ead63412bbda132ba9404583c1704121dfbcbaf Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 10 十二月 2024 20:16:13 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 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 b0b5852..ca35e35 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
@@ -153,6 +153,10 @@
             }else{
                 throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鍛樺伐淇℃伅鍚屾瀹夐槻骞冲彴澶辫触锛岃绋嶅悗閲嶈瘯锛�");
             }
+        }catch (BusinessException e){
+            //濡傛灉鍙戠敓寮傚父锛屽垹闄ゅ凡缁忓垱寤虹殑浜哄憳淇℃伅
+            deleteHkUserBiz(new String[]{insert.getHkId()});
+            throw  e;
         }catch (Exception e){
             //濡傛灉鍙戠敓寮傚父锛屽垹闄ゅ凡缁忓垱寤虹殑浜哄憳淇℃伅
             e.printStackTrace();
@@ -243,7 +247,7 @@
      * @return
      */
     private boolean dealHkUserBiz(Member insert) {
-        String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
+        String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_LOCAL_RESOURCE_PATH).getCode()
                 +systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
         UserAddRequest hkAddRequest = HkSyncOrgUserToHKServiceImpl.getUserAddModel(insert,path,Constants.ZERO);
         if(hkAddRequest == null){
@@ -266,7 +270,7 @@
         return false;
     }
     private boolean dealHkUserForUpdateBiz(Member update ) {
-        String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
+        String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_LOCAL_RESOURCE_PATH).getCode()
                 +systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
 
         UserAddRequest hkAddRequest = HkSyncOrgUserToHKServiceImpl.getUserAddModel(update,path,Constants.ONE);
@@ -418,7 +422,6 @@
                         .ne(Member::getId,member.getId())) >0){
                     throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "韬唤璇佸彿銆�"+member.getIdcardNoNew()+"銆戝凡琚娇鐢紝涓嶈兘閲嶅");
                 }
-
                 member.setSex(Constants.getSexByCardNo( member.getIdcardNoNew()));//鏍规嵁韬唤璇佸彿鑾峰彇鎬у埆
                 member.setIdcardDecode( Constants.getTuominStr(member.getIdcardNoNew()));
                 member.setIdcardNo(encrptNo);
@@ -970,7 +973,7 @@
         wrapper.lambda().ne(Member::getRemark,"浜鸿劯宸插悓姝ユ渶鏂�");
         List<Member> list =memberMapper.selectList(wrapper);
        if(list!=null){
-           String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
+           String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_LOCAL_RESOURCE_PATH).getCode()
                    +systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
            for(Member m : list){
              String faceId=  HkSyncOrgUserToHKServiceImpl.dealMemberFace(m,path);
@@ -1715,10 +1718,10 @@
             openId = tokenJson.getString("openid");
         }
         WxAuthorizeVO wxAuthorizeVO = new WxAuthorizeVO();
-        wxAuthorizeVO.setOpenid(openId);
         if(StringUtils.isBlank(openId)){
             return wxAuthorizeVO;
         }
+        wxAuthorizeVO.setOpenid(openId);
         if(source==1){
             //鏍规嵁openId 鏌ヨ鐢ㄦ埛淇℃伅
             Member member = memberJoinMapper.selectJoinOne(Member.class,new MPJLambdaWrapper<Member>()

--
Gitblit v1.9.3