Merge remote-tracking branch 'origin/master'

jiangping

2024-07-12 de70d21d8dea3e8ae972722456e3e8223a798ae5

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

@@ -4,6 +4,11 @@
import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
import com.alibaba.fastjson.JSONObject;
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.ZTUserGetTokenRequest;
import com.doumee.biz.zbom.model.zhongtai.ZTUserInfoUpdateRequest;
import com.doumee.biz.zbom.model.zhongtai.response.ZTUserGetTokenResponse;
import com.doumee.config.Jwt.JwtPayLoad;
import com.doumee.config.Jwt.JwtTokenUtil;
import com.doumee.core.constants.ResponseStatus;
@@ -54,6 +59,9 @@

    @Autowired
    private SystemDictDataBiz systemDictDataBiz;

    @Autowired
    private ZbomZhongTaiService zbomZhongTaiService;

    @Autowired
    private RedisTemplate<String,Object> redisTemplate;
@@ -301,6 +309,28 @@

    @Override
    public void updMemberDetail(EditMemberRequest editMemberRequest){
        Member member = memberMapper.selectById(editMemberRequest.getMemberId());
        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());
        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());
        }
        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(),"中台信息更新失败，请联系管理员");
        }
        memberMapper.update(new UpdateWrapper<Member>()
                .lambda()
                .set(StringUtils.isNotBlank(editMemberRequest.getImgurl()),Member::getImgurl,editMemberRequest.getImgurl())
@@ -318,8 +348,8 @@
                .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()));

    }

    @Override
@@ -334,4 +364,60 @@
        return member;
    }


    /**
     * 更新中台token信息
     * @param member
     */
    public void updUserZTToken(Member member){
        //如果无有效期/已过期 重新获取
        if(Objects.isNull(member.getTokenDate()) || member.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(member.getOpenid());
            ZTUserGetTokenResponse ztUserGetTokenResponse = zbomZhongTaiService.getUserToken(param);
            if(Objects.nonNull(ztUserGetTokenResponse)){
                member.setToken(ztUserGetTokenResponse.getToken());
                //TODO 暂无过期日期
                memberMapper.update(new UpdateWrapper<Member>().lambda().set(Member::getToken,ztUserGetTokenResponse.getToken())
                        .eq(Member::getId,member.getId()));
            }else{
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"中台TOKEN获取失败，请联系管理员");
            }
        };
    }



    @Override
    public void logOff(Long memberId){
        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信息
        this.updUserZTToken(member);
        //调起中台注销接口
        ZTBaseRequst ztBaseRequst = new ZTBaseRequst();
        ztBaseRequst.setUserType(Constants.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(),"中台注销失败，请联系管理员");
    }


}