From 98802a28acb95a01058ae34c5d9b3985028c9399 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 06 十二月 2024 17:18:14 +0800
Subject: [PATCH] 代码初始化

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 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 e6e736f..d637458 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
@@ -1716,6 +1716,9 @@
         }
         WxAuthorizeVO wxAuthorizeVO = new WxAuthorizeVO();
         wxAuthorizeVO.setOpenid(openId);
+        if(StringUtils.isBlank(openId)){
+            return wxAuthorizeVO;
+        }
         if(source==1){
             //鏍规嵁openId 鏌ヨ鐢ㄦ埛淇℃伅
             Member member = memberJoinMapper.selectJoinOne(Member.class,new MPJLambdaWrapper<Member>()
@@ -1762,7 +1765,7 @@
                     .last(" limit 1 "));
             //闈炶瀹㈢敤鎴� 杩涜鍒ゆ柇鏄惁瀛樺湪鐢ㄦ埛
             if(!Objects.isNull(user)){
-                Member member = memberMapper.selectById(user.getId());
+                Member member = memberMapper.selectById(user.getMemberId());
                 if(member.getIsdeleted() == Constants.ONE){
                     throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸插垹闄�,璇疯仈绯荤鐞嗗憳");
                 }
@@ -2091,6 +2094,7 @@
         }
         if(memberMapper.selectCount(new QueryWrapper<Member>().lambda()
                 .eq(Member::getIsdeleted,Constants.ZERO)
+                .ne(Member::getType,Constants.memberType.visitor)
                 .eq(Member::getPhone,registerDriverDTO.getPhone())
         )>Constants.ZERO){
             throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鎵嬫満鍙峰凡娉ㄥ唽!");
@@ -2108,7 +2112,7 @@
         Member member = new Member();
         member.setCreateDate(new Date());
         member.setIsdeleted(Constants.ZERO);
-        member.setType(Constants.THREE);
+        member.setType(Constants.memberType.driver);
         member.setName(registerDriverDTO.getName());
         member.setPhone(registerDriverDTO.getPhone());
         member.setStatus(Constants.ZERO);
@@ -2126,6 +2130,7 @@
         systemUser.setSalt(salt);
         systemUser.setPassword(member.getPassward());
         systemUser.setStatus(Constants.ZERO);
+        systemUser.setType(Constants.memberType.driver);
         systemUser.setSource(Constants.TWO);
         systemUserMapper.insert(systemUser);
 

--
Gitblit v1.9.3