From a75b18a4157ab486e0b51c438ac165ab3a08e3e0 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 25 七月 2024 18:10:00 +0800
Subject: [PATCH] 代码提交

---
 server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java |  269 +++++++++++++++++++++++++++++++++++------------------
 1 files changed, 175 insertions(+), 94 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 9dce68e..c6c0fa3 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -3,11 +3,18 @@
 import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
 import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.doumee.biz.system.SystemDictDataBiz;
 import com.doumee.biz.zbom.ZbomZhongTaiService;
 import com.doumee.biz.zbom.model.zhongtai.ZTBaseRequst;
+import com.doumee.biz.zbom.model.zhongtai.ZTConstants;
 import com.doumee.biz.zbom.model.zhongtai.ZTUserGetTokenRequest;
 import com.doumee.biz.zbom.model.zhongtai.ZTUserInfoUpdateRequest;
+import com.doumee.biz.zbom.model.zhongtai.response.ZTBaseResponse;
+import com.doumee.biz.zbom.model.zhongtai.response.ZTSysuserGetTokenResponse;
 import com.doumee.biz.zbom.model.zhongtai.response.ZTUserGetTokenResponse;
 import com.doumee.config.Jwt.JwtPayLoad;
 import com.doumee.config.Jwt.JwtTokenUtil;
@@ -15,40 +22,32 @@
 import com.doumee.core.exception.BusinessException;
 import com.doumee.core.model.PageData;
 import com.doumee.core.model.PageWrap;
-import com.doumee.core.oss.FileModel;
 import com.doumee.core.utils.CodeVerifyUtils;
 import com.doumee.core.utils.Constants;
-import com.doumee.core.utils.DateUtil;
 import com.doumee.core.utils.Utils;
 import com.doumee.core.wx.WxMiniConfig;
+import com.doumee.dao.business.CustomerUserMapper;
 import com.doumee.dao.business.MemberMapper;
 import com.doumee.dao.business.UsersMapper;
-import com.doumee.dao.business.model.InterfaceLog;
+import com.doumee.dao.business.model.CustomerUser;
 import com.doumee.dao.business.model.Member;
 import com.doumee.dao.business.model.Users;
 import com.doumee.dao.web.reqeust.EditMemberRequest;
 import com.doumee.dao.web.reqeust.WxPhoneRequest;
 import com.doumee.dao.web.response.AccountResponse;
+import com.doumee.dao.web.response.ZTBaseInfoResponse;
 import com.doumee.service.business.MemberService;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import me.chanjar.weixin.common.error.WxErrorException;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-import org.apache.catalina.User;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.util.*;
-import java.util.concurrent.TimeUnit;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * 鐢ㄦ埛淇℃伅琛⊿ervice瀹炵幇
@@ -63,6 +62,9 @@
 
     @Autowired
     private UsersMapper usersMapper;
+
+    @Autowired
+    private CustomerUserMapper customerUserMapper;
 
     @Autowired
     private SystemDictDataBiz systemDictDataBiz;
@@ -265,7 +267,7 @@
 
 
     @Override
-    public AccountResponse wxLogin(String code){
+    public AccountResponse wxLogin(String code,String userId){
         try {
 //            鑾峰彇寰俊鏁忔劅鏁版嵁
             WxMaJscode2SessionResult session = WxMiniConfig.wxCustomerService.getUserService().getSessionInfo(code);
@@ -273,18 +275,41 @@
             if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isBlank(openId)) {
                 throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鑾峰彇openid澶辫触锛佽鑱旂郴绠$悊鍛�");
             }
-            Member member = memberMapper.selectOne(new QueryWrapper<Member>().eq("OPENID", openId));
+//            String openId = code;
+            Member member = memberMapper.selectOne(new QueryWrapper<Member>().eq("OPENID", openId).isNotNull("phone"));
+            Users users = new Users();
+            if(StringUtils.isNotBlank(userId)){
+                users = usersMapper.selectById(userId);
+            }
             if (member == null) {
                 member = new Member();
                 member.setNickname("寰俊鐢ㄦ埛"+ CodeVerifyUtils.createVerificationCode(4));
                 member.setCreateDate(new Date());
                 member.setIsdeleted(Constants.ZERO);
+                member.setOpenid(openId);
                 member.setType(Constants.ZERO);
+                //濡傛灉缁戝畾浜嗗璐� 鍒欑洿鎺ヤ娇鐢ㄥ凡缁戝畾瀵艰喘淇℃伅 璺宠繃鎵嬫満鍙风粦瀹氱殑鐘舵��
+                if(Objects.nonNull(users)){
+                    member.setAuthStatus(Constants.TWO);
+                }else{
+                    member.setAuthStatus(Constants.ZERO);
+                }
+                ZTUserGetTokenResponse ztUserGetTokenResponse = this.syncZhongTaiUser(member);
+                if(!Objects.isNull(ztUserGetTokenResponse)){
+                    member.setToken(ztUserGetTokenResponse.getToken());
+                }
                 memberMapper.insert(member);
+                MemberServiceImpl.saveCustomerUser(customerUserMapper,users,member.getId());
+            }else{
+                ZTUserGetTokenResponse ztUserGetTokenResponse = this.syncZhongTaiUser(member);
+                if(!Objects.isNull(ztUserGetTokenResponse)){
+                    member.setToken(ztUserGetTokenResponse.getToken());
+                    memberMapper.updateById(member);
+                }
+                MemberServiceImpl.saveCustomerUser(customerUserMapper,users,member.getId());
+                member = this.getMemberInfo(member.getId());
             }
-            //鍒涘缓token
-            JwtPayLoad payLoad = new JwtPayLoad(member.getId(),Constants.ZERO);
-            String token = JwtTokenUtil.generateToken(payLoad);
+            String token = JwtTokenUtil.generateTokenForZb(member.getId(),ZTConstants.CUSTOMER, JSONObject.toJSON(member).toString(),redisTemplate);
             AccountResponse accountResponse = new AccountResponse();
             accountResponse.setToken(token);
             accountResponse.setSessionKey(session.getSessionKey());
@@ -295,6 +320,28 @@
         }
         throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"寰俊鐧诲綍寮傚父锛佽鑱旂郴绠$悊鍛�");
     }
+
+    public static void saveCustomerUser(CustomerUserMapper customerUserMapper,Users users,Long memberId){
+        if(Objects.nonNull(users)&&Objects.nonNull(memberId)) {
+            if (customerUserMapper.selectCount(new QueryWrapper<CustomerUser>().lambda()
+                    .eq(CustomerUser::getIsdeleted, Constants.ZERO)
+                    .eq(CustomerUser::getUserId, users.getId())
+                    .eq(CustomerUser::getMemberId, memberId)) <= Constants.ZERO) {
+                CustomerUser customerUser = new CustomerUser();
+                customerUser.setUserId(users.getId());
+                customerUser.setCreateDate(new Date());
+                customerUser.setMemberId(memberId);
+                customerUser.setPhone(users.getPhone());
+                customerUser.setIamUserId(users.getIamId());
+                customerUser.setName(users.getName());
+                customerUser.setUsername(users.getIamUsername());
+                customerUser.setAddr(users.getShopAddress());
+                customerUserMapper.insert(customerUser);
+                //TODO 绛夊緟璋冭捣涓彴鎺ュ彛
+            }
+        }
+    }
+
 
     @Override
     public String getWxMiniPhone(WxPhoneRequest wxPhoneRequest){
@@ -313,49 +360,80 @@
         throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏇存柊鎵嬫満鍙峰け璐�");
     }
 
+
     @Override
-    public void updMemberDetail(EditMemberRequest editMemberRequest){
-        Member member = memberMapper.selectById(editMemberRequest.getMemberId());
+    public Member updMemberDetail(EditMemberRequest editMemberRequest){
+        Member member = memberMapper.selectById(editMemberRequest.getId());
+        if(Objects.isNull(member)){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY);
+        }
+        if(Objects.isNull(editMemberRequest)){
+            throw new BusinessException(ResponseStatus.BAD_REQUEST);
+        }
+        Member memberDto = new Member();
+        BeanUtils.copyProperties(editMemberRequest,memberDto);
+        memberDto.setOpenid(member.getOpenid());
+//        ZTUserGetTokenResponse ztUserGetTokenResponse = this.syncZhongTaiUser(memberDto);
+//        if(Objects.isNull(ztUserGetTokenResponse)){
+//            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓彴鏈嶅姟璋冭捣澶辫触!");
+//        }else{
+//            member.setToken(ztUserGetTokenResponse.getToken());
+//        }
+        memberMapper.updateById(memberDto);
+        return this.getMemberInfo(member.getId());
+    }
+
+
+
+    @Override
+    public Member updMemberPhone(EditMemberRequest editMemberRequest){
+        if(Objects.isNull(editMemberRequest)||StringUtils.isBlank(editMemberRequest.getPhone())){
+            throw new BusinessException(ResponseStatus.BAD_REQUEST);
+        }
+        Member member = memberMapper.selectById(editMemberRequest.getId());
+        if(Objects.isNull(member)){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY);
+        }
+        Member memberDto = new Member();
+        BeanUtils.copyProperties(editMemberRequest,memberDto);
+        memberDto.setOpenid(member.getOpenid());
+//        ZTUserGetTokenResponse ztUserGetTokenResponse = this.syncZhongTaiUser(memberDto);
+//        if(Objects.isNull(ztUserGetTokenResponse)){
+//            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓彴鏈嶅姟璋冭捣澶辫触!");
+//        }else{
+//            member.setToken(ztUserGetTokenResponse.getToken());
+//        }
+        memberMapper.updateById(memberDto);
+        return this.getMemberInfo(member.getId());
+    }
+
+
+    public ZTUserGetTokenResponse syncZhongTaiUser(Member member){
         ZTUserInfoUpdateRequest ztUserInfoUpdateRequest = new  ZTUserInfoUpdateRequest();
         ztUserInfoUpdateRequest.setOpenId(member.getOpenid());
         String appId = systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG,Constants.WX_APPID_CUSTOMER).getCode();
         ztUserInfoUpdateRequest.setAppId(appId);
         ztUserInfoUpdateRequest.setPlatform(Constants.PLATFORM);
-        ztUserInfoUpdateRequest.setPhone(editMemberRequest.getPhone());
-        ztUserInfoUpdateRequest.setName(editMemberRequest.getName());
-        ztUserInfoUpdateRequest.setAddress(editMemberRequest.getProvinceName()+editMemberRequest.getCityName()+editMemberRequest.getAreaName());
-        ztUserInfoUpdateRequest.setFullAddress(editMemberRequest.getAddress());
+        ztUserInfoUpdateRequest.setPhone(member.getPhone());
+        ztUserInfoUpdateRequest.setName(member.getNickname());
+//        ztUserInfoUpdateRequest.setAddress(member.getProvinceName()+member.getCityName()+member.getAreaName());
+        ztUserInfoUpdateRequest.setFullAddress(member.getAddress());
         String prefix = systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.RESOURCE_PATH).getCode() +
                 systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.MEMBER).getCode();
-        if(StringUtils.isNotBlank(editMemberRequest.getImgurl())){
-            ztUserInfoUpdateRequest.setAvatarUrl(prefix + editMemberRequest.getImgurl());
+        if(StringUtils.isNotBlank(member.getImgurl())){
+            ztUserInfoUpdateRequest.setAvatarUrl(prefix + member.getImgurl());
         }
-        ztUserInfoUpdateRequest.setUptown(editMemberRequest.getDistrict());
-        ztUserInfoUpdateRequest.setHouseArea(editMemberRequest.getHousearea().toString());
-        ztUserInfoUpdateRequest.setHouseLayout(Constants.getHouseLayout(editMemberRequest.getHousetype()));
-        ZTUserGetTokenResponse userUpdateInfo = zbomZhongTaiService.userUpdateInfo(ztUserInfoUpdateRequest);
-        if(Objects.isNull(userUpdateInfo)){
-            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓彴淇℃伅鏇存柊澶辫触锛岃鑱旂郴绠$悊鍛�");
+        ztUserInfoUpdateRequest.setUptown(member.getDistrict());
+        if(Objects.nonNull(member.getHousearea())){
+            ztUserInfoUpdateRequest.setHouseArea(member.getHousearea().toString());
         }
-        memberMapper.update(new UpdateWrapper<Member>()
-                .lambda()
-                .set(StringUtils.isNotBlank(editMemberRequest.getImgurl()),Member::getImgurl,editMemberRequest.getImgurl())
-                .set(StringUtils.isNotBlank(editMemberRequest.getName()),Member::getName,editMemberRequest.getName())
-                .set(StringUtils.isNotBlank(editMemberRequest.getPhone()),Member::getPhone,editMemberRequest.getPhone())
-                .set(StringUtils.isNotBlank(editMemberRequest.getProvinceName()),Member::getProvinceName,editMemberRequest.getProvinceName())
-                .set(StringUtils.isNotBlank(editMemberRequest.getProvinceCode()),Member::getProvinceCode,editMemberRequest.getProvinceCode())
-                .set(StringUtils.isNotBlank(editMemberRequest.getCityCode()),Member::getCityCode,editMemberRequest.getCityCode())
-                .set(StringUtils.isNotBlank(editMemberRequest.getCityName()),Member::getCityName,editMemberRequest.getCityName())
-                .set(StringUtils.isNotBlank(editMemberRequest.getAreaCode()),Member::getAreaCode,editMemberRequest.getAreaCode())
-                .set(StringUtils.isNotBlank(editMemberRequest.getAreaName()),Member::getAreaName,editMemberRequest.getAreaName())
-                .set(StringUtils.isNotBlank(editMemberRequest.getAddress()),Member::getAddress,editMemberRequest.getAddress())
-                .set(StringUtils.isNotBlank(editMemberRequest.getDistrict()),Member::getDistrict,editMemberRequest.getDistrict())
-                .set(Objects.nonNull(editMemberRequest.getHousearea()),Member::getHousearea,editMemberRequest.getHousearea())
-                .set(StringUtils.isNotBlank(editMemberRequest.getHousetype()),Member::getHousetype,editMemberRequest.getHousetype())
-                .set(Objects.nonNull(editMemberRequest.getLatitude()),Member::getLatitude,editMemberRequest.getLatitude())
-                .set(Objects.nonNull(editMemberRequest.getLongitude()),Member::getLongitude,editMemberRequest.getLongitude())
-                .set(Member::getToken,userUpdateInfo.getToken())
-                .eq(Member::getId,editMemberRequest.getMemberId()));
+        ztUserInfoUpdateRequest.setHouseLayout(Constants.getHouseLayout(member.getHousetype()));
+        ZTBaseResponse userUpdateInfo = zbomZhongTaiService.userUpdateInfo(ztUserInfoUpdateRequest);
+        if(Objects.isNull(userUpdateInfo)||userUpdateInfo.getCode()!=200){
+            return null;
+        }
+        ZTUserGetTokenResponse ztUserGetTokenResponse = (ZTUserGetTokenResponse) userUpdateInfo.getData();
+        return ztUserGetTokenResponse;
     }
 
     @Override
@@ -367,18 +445,31 @@
         String prefix = systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.RESOURCE_PATH).getCode() +
                 systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.MEMBER).getCode();
         member.setPrefix(prefix);
-        return member;
+        if( customerUserMapper.selectCount(new QueryWrapper<CustomerUser>().lambda().eq(CustomerUser::getIsdeleted,Constants.ZERO).eq(CustomerUser::getMemberId,member.getId()))>0){
+            member.setAuthStatus(Constants.TWO);
+        }else{
+            if(StringUtils.isBlank(member.getPhone())){
+                member.setAuthStatus(Constants.ZERO);
+            }else{
+                member.setAuthStatus(Constants.ONE);
+            }
+        }
+       return member;
     }
 
 
 
 
-    public static String getZTToken(ZbomZhongTaiService zbomZhongTaiService, MemberMapper memberMapper, UsersMapper usersMapper, SystemDictDataBiz systemDictDataBiz, String id, String userType){
-        if(userType.equals(Constants.CUSTOMER)){
+    public static ZTBaseInfoResponse getZTToken(ZbomZhongTaiService zbomZhongTaiService,
+                                                MemberMapper memberMapper, UsersMapper usersMapper, SystemDictDataBiz systemDictDataBiz, Long id, String userType){
+        ZTBaseInfoResponse ztBaseInfoResponse = new ZTBaseInfoResponse();
+        if(userType.equals(ZTConstants.CUSTOMER)){
             Member member = memberMapper.selectById(id);
             if(Objects.isNull(member)){
                 throw new BusinessException(ResponseStatus.BAD_REQUEST);
             }
+            ztBaseInfoResponse.setUserType(ZTConstants.CUSTOMER);
+            ztBaseInfoResponse.setOpenId(member.getOpenid());
             //濡傛灉鏃犳湁鏁堟湡/宸茶繃鏈� 閲嶆柊鑾峰彇
             if(Objects.isNull(member.getTokenDate()) || member.getTokenDate().getTime()<=System.currentTimeMillis() ){
                 ZTUserGetTokenRequest param = new ZTUserGetTokenRequest();
@@ -388,73 +479,63 @@
                 param.setOpenId(member.getOpenid());
                 ZTUserGetTokenResponse ztUserGetTokenResponse = zbomZhongTaiService.getUserToken(param);
                 if(Objects.nonNull(ztUserGetTokenResponse)){
+//                    Date date =new Date(System.currentTimeMillis()+(Constants.formatLongNum(ztUserGetTokenResponse.getExpire())<=0?2*60*60*1000:ztUserGetTokenResponse.getExpire()*1000));
                     member.setToken(ztUserGetTokenResponse.getToken());
-                    //TODO 鏆傛棤杩囨湡鏃ユ湡
-                    memberMapper.update(new UpdateWrapper<Member>().lambda().set(Member::getToken,ztUserGetTokenResponse.getToken())
+                    memberMapper.update(new UpdateWrapper<Member>().lambda()
+                            .set(Member::getToken,ztUserGetTokenResponse.getToken())
+//                            .set(Member::getTokenDate,date)//榛樿鏈夋晥鏈熶负涓ゅ皬鏃�
                             .eq(Member::getId,member.getId()));
-                    return ztUserGetTokenResponse.getToken();
-                }else{
-                    throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓彴TOKEN鑾峰彇澶辫触锛岃鑱旂郴绠$悊鍛�");
+                    ztBaseInfoResponse.setToken(ztUserGetTokenResponse.getToken());
                 }
             }
-            return member.getToken();
-        }else if(userType.equals(Constants.BUSINESS)){
+            ztBaseInfoResponse.setToken(member.getToken());
+            return ztBaseInfoResponse;
+        }else if(userType.equals(ZTConstants.BUSINESS)){
             Users users = usersMapper.selectById(id);
             if(Objects.isNull(users)){
                 throw new BusinessException(ResponseStatus.BAD_REQUEST);
             }
+            ztBaseInfoResponse.setUserType(ZTConstants.BUSINESS);
+            ztBaseInfoResponse.setOpenId(users.getOpenid());
             if(Objects.isNull(users.getTokenDate()) || users.getTokenDate().getTime()<=System.currentTimeMillis() ){
-                ZTUserGetTokenRequest param = new ZTUserGetTokenRequest();
-                //鏌ヨAPPID
-                String appId = systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG,Constants.WX_APPID_CUSTOMER).getCode();
-                param.setAppId(appId);
-                param.setOpenId(users.getOpenid());
-                ZTUserGetTokenResponse ztUserGetTokenResponse = zbomZhongTaiService.getUserToken(param);
+                ZTSysuserGetTokenResponse ztUserGetTokenResponse = zbomZhongTaiService.getSysuserToken(users.getPhone());
                 if(Objects.nonNull(ztUserGetTokenResponse)){
                     users.setToken(ztUserGetTokenResponse.getToken());
-                    //TODO 鏆傛棤杩囨湡鏃ユ湡
+                    Date date =new Date(System.currentTimeMillis()+(Constants.formatLongNum(ztUserGetTokenResponse.getExpire())<=0?2*60*60*1000:ztUserGetTokenResponse.getExpire()*1000));
                     usersMapper.update(new UpdateWrapper<Users>().lambda().set(Users::getToken,ztUserGetTokenResponse.getToken())
+                            .set(Users::getTokenDate,date)//榛樿鏈夋晥鏈熶负涓ゅ皬鏃�
                             .eq(Users::getId,users.getId()));
-                    return ztUserGetTokenResponse.getToken();
-                }else{
-                    throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓彴TOKEN鑾峰彇澶辫触锛岃鑱旂郴绠$悊鍛�");
+                    ztBaseInfoResponse.setToken(ztUserGetTokenResponse.getToken());
+                    return ztBaseInfoResponse;
                 }
             }
-            return users.getToken();
-        }else{
-            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍙傛暟閿欒");
+            ztBaseInfoResponse.setToken(users.getToken());
         }
+        return  ztBaseInfoResponse;
     }
 
 
-
-
     @Override
-    public void logOff(Long memberId){
+    public ZTBaseRequst logOff(Long memberId,String token){
         Member member = memberMapper.selectById(memberId);
         if(Objects.isNull(member)){
             throw new BusinessException(ResponseStatus.DATA_EMPTY);
         }
-        if(StringUtils.isBlank(member.getPhone())){
-            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸叉敞閿�");
-        }
         //鏍¢獙鐢ㄦ埛token淇℃伅
-        MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,member.getId().toString(),Constants.CUSTOMER);
+        MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,member.getId(),ZTConstants.CUSTOMER);
         //璋冭捣涓彴娉ㄩ攢鎺ュ彛
         ZTBaseRequst ztBaseRequst = new ZTBaseRequst();
-        ztBaseRequst.setUserType(Constants.CUSTOMER);
+        ztBaseRequst.setUserType(ZTConstants.CUSTOMER);
         ztBaseRequst.setOpenId(member.getOpenid());
         ztBaseRequst.setToken(member.getToken());
-        Boolean logoutFlag = zbomZhongTaiService.userLogout(ztBaseRequst);
-        if(logoutFlag){
-            memberMapper.update(new UpdateWrapper<Member>().lambda()
-                    .set(Member::getPhone,null)
-                    .set(Member::getEditDate,new Date())
-                    .eq(Member::getId,member.getId())
-            );
-            return;
-        }
-        throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓彴娉ㄩ攢澶辫触锛岃鑱旂郴绠$悊鍛�");
+        memberMapper.update(new UpdateWrapper<Member>().lambda()
+                .set(Member::getOpenid,null)
+                .set(Member::getPhone,null)
+                .set(Member::getEditDate,new Date())
+                .eq(Member::getOpenid,member.getOpenid())
+        );
+        redisTemplate.delete(token);
+        return ztBaseRequst;
     }
 
 

--
Gitblit v1.9.3