Merge remote-tracking branch 'origin/test_elder_cedoo' into test_elder_cedoo

CeDo

2021-06-10 af73409f431fb97eade82d34eff8c7b05e7fac92

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -1917,6 +1917,9 @@
            sysUserDO.setName(sysUserDO.getNickName());
        }
        sysUserDO.setType(6);
        if(StringUtils.isEmpty(eventGridMemberAddDTO.getImageUrl())){
            sysUserDO.setImageUrl(Constants.ZONG_ZHI_GRID_MEMBER_IMAGE_URL);
        }
        int insert = 0;
        try {
            insert = userDao.insert(sysUserDO);
@@ -1928,9 +1931,9 @@
            e.printStackTrace();
            log.error("新增后台用户报错【{}】", e.getMessage());
            if (e.getMessage().contains("union_phone_type")) {
                throw new ServiceException("手机号已经存在");
                return R.fail("手机号已经存在");
            } else if (e.getMessage().contains("union_account_type")) {
                throw new ServiceException("账户已经存在");
                return R.fail("账户已经存在");
            }
        }
        if(insert > 0){
@@ -1983,9 +1986,9 @@
            e.printStackTrace();
            log.error("修改网格员用户报错【{}】", e.getMessage());
            if (e.getMessage().contains("union_phone_type")) {
                throw new ServiceException("手机号已经存在");
                return R.fail("手机号已经存在");
            } else if (e.getMessage().contains("union_account_type")) {
                throw new ServiceException("账户已经存在");
                return R.fail("账户已经存在");
            }
        }
        if(insert > 0){
@@ -2034,4 +2037,15 @@
        userDao.gridMemberEditStatus(gridMemberEditDTO);
        return R.ok();
    }

    public R noTips(Long userId){
        SysUserDO userDO = this.userDao.selectById(userId);
        if(userDO != null){
            userDO.setBigAgeTips(2);
            if(this.userDao.updateById(userDO) > 0){
                return R.ok();
            }
        }
        return R.fail();
    }
}