修改bug

puzhibing

2024-01-19 dc600db1211ba96302c2f75b4dd224512aad89cf

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java

@@ -625,8 +625,14 @@
        String phoneNumber = merMemberAddDto.getPhonenumber();
        Member oldMember = this.getByMobile(phoneNumber);
        // Check if the member already exists
        if (oldMember != null) {
        if (oldMember != null && oldMember.getBindingFlag() == 1) {
            throw new ServiceException(AppErrorConstant.MOBILE_USER_DOUBLE);
        }
        if (oldMember != null && oldMember.getBindingFlag() == 0) {
            oldMember.setRelationShopId(merMemberAddDto.getShopId());
            oldMember.setBindingFlag(1);
            this.updateById(oldMember);
            return oldMember.getUserId();
        }
        // Get the sysUser by mobile number
        SysUser sysUser = sysUserService.getSysUserByMobile(phoneNumber).getData();
@@ -943,7 +949,7 @@
                //活跃度赋值
                Date lastPayTime;
                for (MgtMemberPageVo mgtMemberPageVo : memberPageVoList) {
                    if(null != mgtMemberPageVo.getRelationShopId()){
                    if(null != mgtMemberPageVo.getRelationShopId() && 1 == mgtMemberPageVo.getBindingFlag()){
                        R<Shop> shop_r = remoteShopService.getShop(mgtMemberPageVo.getRelationShopId());
                        if(shop_r.getCode() == 200){
                            Shop data = shop_r.getData();
@@ -1154,7 +1160,6 @@
                    mgtMemberGetVo.setRelationShopName(data.getShopName());
                }
            }

        }
        mgtMemberGetVo.setIntegral(memberTotal.getTotalIntegral());
        mgtMemberGetVo.setMemberFrom(member.getCustomerSource());
@@ -2186,12 +2191,13 @@
     */
    @Override
    public void sendBirthdayBless(){
        List<String> mobileList = memberMapper.listTodayBirthday();
        List<Member> mobileList = memberMapper.listTodayBirthday();
        if(mobileList!=null&&!mobileList.isEmpty()){
            log.info("生日祝福发送短信---"+mobileList.toString());
            for(String mobile : mobileList){
            for(Member member : mobileList){
                try {
                    MsgUtils.sendMsg(mobile,null,null);
                    String msg = "{\"name\":\"" + (StringUtils.isEmpty(member.getRealName()) ? member.getNickName() : member.getRealName()) + "\"}";
                    MsgUtils.sendMsg(member.getMobile(),null, msg);
                } catch (Exception e) {
                    throw new RuntimeException(e);
                }