Merge remote-tracking branch 'origin/master'

doum

10 小时以前 0a206f3acb9af0ec9db650861d34a256cda1c960

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

@@ -312,7 +312,7 @@
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"获取openid失败！请联系管理员");
            }
            Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getOpenId, openId)
                            .eq(Member::getIsdeleted,Constants.ZERO)
                            .eq(Member::getIsdeleted,Constants.ZERO).eq(Member::getStatus,Constants.ZERO)
                    .last(" limit 1"));
            AccountResponse accountResponse = new AccountResponse();
            if(Objects.nonNull(member)){
@@ -356,44 +356,43 @@
            if(Objects.isNull(phone)){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"未获取到手机号");
            }
            Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getOpenId, wxPhoneRequest.getOpenid())
                    .eq(Member::getIsdeleted,Constants.ZERO)
            Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getPhone, phone)
                    .eq(Member::getIsdeleted,Constants.ZERO).eq(Member::getStatus,Constants.ZERO)
                    .last(" limit 1"));
            if (member == null) {
                member = new Member();
                member.setImgurl("20230410/4010b821-2137-4e6d-86e4-5ab9c06184a4.png");
                member.setNickname("微信用户"+ CodeVerifyUtils.createVerificationCode(4));
                member.setCreateDate(new Date());
                member.setIsdeleted(Constants.ZERO);
                member.setType(Constants.ZERO);
                member.setOrigin(Constants.ZERO);
                if(!this.checkIsCreateInvite(phone)){
                    member.setRecId(Constants.getInviteCode(wxPhoneRequest.getRecId()));
                    member.setRecId(wxPhoneRequest.getRecId());
                }
                member.setOpenId(wxPhoneRequest.getOpenid());
                member.setIntegral(BigDecimal.ZERO);
                member.setPhone(phone);
            }
            member.setPhone(phone);
            member.setOpenId(wxPhoneRequest.getOpenid());
            member.setEditDate(new Date());
            member.setImgFullUrl(systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+
                    systemDictDataBiz.queryByCode(Constants.OSS,Constants.MEMBER_FILE).getCode()+member.getImgurl());
            if(Objects.isNull(member.getId())){
                memberMapper.insert(member);

                PlatformConfigDTO platformConfigDTO = systemDictDataService.getPlatformConfigDTO();
                this.createRegionReward(member,platformConfigDTO);
                //创建邀请记录
                this.createInviteRecord(member,platformConfigDTO);
                member.setSharingCode(this.createShareCode(member.getId()));
//                member.setSharingCode(this.createShareCode(member.getId()));
                memberMapper.updateById(member);
            }else{
                if(StringUtils.isBlank(member.getSharingCode())){
                    member.setSharingCode(this.createShareCode(member.getId()));
                }
//                if(StringUtils.isBlank(member.getSharingCode())){
//                    member.setSharingCode(this.createShareCode(member.getId()));
//                }
                memberMapper.updateById(member);
            }
//            JwtPayLoad payLoad = new JwtPayLoad(Constants.MEMBER_PREFIX+member.getId());
//            String token = JwtTokenUtil.generateToken(payLoad);
            if(Objects.nonNull(wxPhoneRequest.getShopId())){
                this.bindShopInfo(member.getId(),wxPhoneRequest.getShopId());
            }
            String token = JwtTokenUtil.generateTokenForRedis(member.getId(), Constants.ZERO, JSONObject.toJSONString(member), redisTemplate);
            AccountResponse accountResponse = new AccountResponse();
            accountResponse.setToken(token);
@@ -793,8 +792,8 @@
        Member  member = memberMapper.selectById(memberId);
        if(Objects.nonNull(member)&&StringUtils.isNotBlank(member.getOpenId())){
            memberMapper.update(new UpdateWrapper<Member>().lambda()
                    .set(Member::getOpenId,null)
                    .set(Member::getPhone,null)
//                    .set(Member::getOpenId,null)
                    .set(Member::getStatus,Constants.TWO)
                    .eq(Member::getId,member.getId())
            );
        }
@@ -802,6 +801,26 @@
    }


    @Override
    public void bindShopInfo(Integer memberId,Integer recId){
        Member  member = memberMapper.selectById(memberId);
        if(Objects.isNull(member)){
            return;
        }
        if (Objects.nonNull(member.getBindShopId())) {
            return;
        }
        Shop shop = shopMapper.selectById(recId);
        if(Objects.nonNull(shop)){
            memberMapper.update(new UpdateWrapper<Member>().lambda()
                    .set(Member::getBindShopId,recId)
                    .set(Member::getBindShopDate,new Date())
                    .eq(Member::getId,member.getId())
            );
        }
    }




}