代码提交

无关风月

2024-11-15 353cf91d3679e68d9b8c07652e4f7791d606dbd4

 xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/service/impl/AppUserServiceImpl.java

@@ -101,6 +101,12 @@
                        dto.getWxOpenId())
                .ne(AppUser::getUserStatus, AppUserStatusEnum.LOGOUT.getCode()).oneOpt();
    }
    @Override
    public Optional<AppUser> getUserByCondition1(AppUserDTO dto) {
        return this.lambdaQuery()
                .eq(AppUser::getCellPhone,dto.getCellPhone())
                .ne(AppUser::getUserStatus,3).oneOpt();
    }

    /**
     * app用户注册
@@ -629,25 +635,14 @@
            List<AppUserQuestion> appUserQuestionList = BeanUtils.copyList(
                    dto.getUserAnswerOneDTOList(), AppUserQuestion.class);
            // 查询用户已填写的答案
            List<AppUserQuestion> baseAppUserQuestionList = appUserQuestionService.lambdaQuery()
                    .eq(AppUserQuestion::getAppUserId, appUser.getUserId())
                    .list();
            if (CollUtils.isNotEmpty(baseAppUserQuestionList)) {
                // 根据类型更新答案
                for (AppUserQuestion appUserQuestion : appUserQuestionList) {
            // 删除之前答案
            appUserQuestionService.lambdaUpdate().eq(AppUserQuestion::getAppUserId,userId).remove();

                    Optional<AppUserQuestion> baseAppUserQuestionOptional = baseAppUserQuestionList.stream()
                            .filter(baseAppUserQuestion -> baseAppUserQuestion.getType()
                                    .equals(appUserQuestion.getType())).findFirst();
                    baseAppUserQuestionOptional.ifPresent(
                            userQuestion -> appUserQuestion.setId(userQuestion.getId()));
                    appUserQuestion.setAppUserId(userId);
                }
            }
            // 根据类型更新答案
            for (AppUserQuestion appUserQuestion : appUserQuestionList) {
                appUserQuestion.setAppUserId(userId);
                    appUserQuestion.setAppUserId(userId);
            }
            appUserQuestionService.saveOrUpdateBatch(appUserQuestionList);
            appUserQuestionService.saveBatch(appUserQuestionList);
            // 筛选答案为是和偶尔有的问题，为用户设置对应的标签
            List<AppUserQuestion> appUserQuestionYesList = appUserQuestionList.stream()
                    .filter(appUserQuestion -> appUserQuestion.getAnswer().equals("1")