Merge remote-tracking branch 'origin/master'

jiangping

2024-09-27 04b4bddaac0a222760113899568d20b45af701f4

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

@@ -334,7 +334,6 @@
    public AccountResponse testLogin(String openid){
            String openId = openid;
            Member member = memberMapper.selectOne(new QueryWrapper<Member>().eq("OPENID", openId));

            if (member == null) {
                member = new Member();
                member.setNickname("微信用户"+ CodeVerifyUtils.createVerificationCode(4));
@@ -581,7 +580,7 @@
    }


    public ZTUserGetTokenResponse syncZhongTaiUser(Member member){
    public static ZTUserGetTokenResponse syncZhongTaiUserNew(Member member,SystemDictDataBiz systemDictDataBiz,ZbomZhongTaiService zbomZhongTaiService){
        ZTUserInfoUpdateRequest ztUserInfoUpdateRequest = new  ZTUserInfoUpdateRequest();
        ztUserInfoUpdateRequest.setOpenId(member.getOpenid());
        String appId = systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG,Constants.WX_APPID_CUSTOMER).getCode();
@@ -616,7 +615,7 @@
        ZTUserGetTokenResponse ztUserGetTokenResponse = (ZTUserGetTokenResponse) userUpdateInfo.getData();
        return ztUserGetTokenResponse;
    }
    public static ZTUserGetTokenResponse syncZhongTaiUserNew(Member member,SystemDictDataBiz systemDictDataBiz,ZbomZhongTaiService zbomZhongTaiService){
    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();