提交

jiangping

2024-07-17 2d9cfa55f0f839ff464b445a259839ab6490d135

 server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java

@@ -6,9 +6,11 @@
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;
@@ -438,12 +440,12 @@
    public static ZTBaseInfoResponse getZTToken(ZbomZhongTaiService zbomZhongTaiService,
                                                MemberMapper memberMapper, UsersMapper usersMapper, SystemDictDataBiz systemDictDataBiz, Long id, String userType){
        ZTBaseInfoResponse ztBaseInfoResponse = new ZTBaseInfoResponse();
        if(userType.equals(Constants.CUSTOMER)){
        if(userType.equals(ZTConstants.CUSTOMER)){
            Member member = memberMapper.selectById(id);
            if(Objects.isNull(member)){
                throw new BusinessException(ResponseStatus.BAD_REQUEST);
            }
            ztBaseInfoResponse.setUserType(Constants.CUSTOMER);
            ztBaseInfoResponse.setUserType(ZTConstants.CUSTOMER);
            ztBaseInfoResponse.setOpenId(member.getOpenid());
            //如果无有效期/已过期 重新获取
            if(Objects.isNull(member.getTokenDate()) || member.getTokenDate().getTime()<=System.currentTimeMillis() ){
@@ -467,12 +469,12 @@
            }
            ztBaseInfoResponse.setToken(member.getToken());
            return ztBaseInfoResponse;
        }else if(userType.equals(Constants.BUSINESS)){
        }else if(userType.equals(ZTConstants.BUSINESS)){
            Users users = usersMapper.selectById(id);
            if(Objects.isNull(users)){
                throw new BusinessException(ResponseStatus.BAD_REQUEST);
            }
            ztBaseInfoResponse.setUserType(Constants.BUSINESS);
            ztBaseInfoResponse.setUserType(ZTConstants.BUSINESS);
            ztBaseInfoResponse.setOpenId(users.getOpenid());
            if(Objects.isNull(users.getTokenDate()) || users.getTokenDate().getTime()<=System.currentTimeMillis() ){
                ZTUserGetTokenRequest param = new ZTUserGetTokenRequest();
@@ -480,7 +482,7 @@
                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());
                    Date date =new Date(System.currentTimeMillis()+(Constants.formatLongNum(ztUserGetTokenResponse.getExpire())<=0?2*60*60*1000:ztUserGetTokenResponse.getExpire()*1000));
@@ -514,10 +516,10 @@
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"用户已注销");
        }
        //校验用户token信息
        MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,member.getId(),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());
        memberMapper.update(new UpdateWrapper<Member>().lambda()