From a8c03746e6bd8ac1d46dc48c1b10bceff543664f Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 10 十二月 2024 20:16:12 +0800
Subject: [PATCH] ll
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 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 cb86390..b0b5852 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
@@ -1709,14 +1709,16 @@
String appSecret = systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_SECRET).getCode();
String getTokenUrl = WXConstant.GET_USER_INFO_URL.replace("CODE", code)
.replace("APPID", appId).replace("SECRET", appSecret);
-// JSONObject tokenJson = JSONObject.parseObject(HttpsUtil.get(getTokenUrl,true));
- String openId = code;
-// if(!Objects.isNull(tokenJson.get("access_token"))){
-// openId = tokenJson.getString("openid");
-// }
-// String openId = "12345";
+ JSONObject tokenJson = JSONObject.parseObject(HttpsUtil.get(getTokenUrl,true));
+ String openId = "";
+ if(Objects.nonNull(tokenJson)&&!Objects.isNull(tokenJson.get("access_token"))){
+ openId = tokenJson.getString("openid");
+ }
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>()
@@ -1763,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(),"鐢ㄦ埛宸插垹闄�,璇疯仈绯荤鐞嗗憳");
}
@@ -2092,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(),"鎵嬫満鍙峰凡娉ㄥ唽!");
@@ -2109,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);
@@ -2127,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