Merge remote-tracking branch 'origin/master'

luodangjia

2024-04-24 065895230f8dc77133ae74d82692a29fe808f39a

 rest/src/main/java/cn/stylefeng/rest/modular/user/controller/UserCenterController.java

@@ -182,13 +182,16 @@

        // 获取绑定顾问岗位ID
        String[] bindWorkerPostIds = customerService.getBindWorkerPostIds(workerNo, post11Enum, post21Enum);
        Customer workerByNo = customerService.getOne(
                Wrappers.<Customer>lambdaUpdate().eq(Customer::getWorkerNo, workerNo).last("LIMIT 1")
        );

        LambdaUpdateWrapper<Customer> wrapper = Wrappers.<Customer>lambdaUpdate().eq(Customer::getCustomerId, userId);
        for (String postId : bindWorkerPostIds) {
            if (postId.equals(post11Enum.getCode().toString())) {
                wrapper.set(Customer::getClassWorkerId, userId);
                wrapper.set(Customer::getClassWorkerId, workerByNo.getCustomerId());
            } else if (postId.equals(post21Enum.getCode().toString())) {
                wrapper.set(Customer::getConsultWorkerId, userId);
                wrapper.set(Customer::getConsultWorkerId, workerByNo.getCustomerId());
            }
        }

@@ -279,10 +282,38 @@
        if (StrUtil.isNotBlank(req.getWorkerNo())) {
            // 获取绑定顾问岗位ID（这里做校验）
            customerService.getBindWorkerPostIds(req.getWorkerNo(), PostIdEnum.PO_11, PostIdEnum.PO_21);

            //绑定工号
            // 幸福顾问
            PostIdEnum post11Enum = PostIdEnum.PO_11;
            // 咨询顾问
            PostIdEnum post21Enum = PostIdEnum.PO_21;

            // 获取绑定顾问岗位ID
            String[] bindWorkerPostIds = customerService.getBindWorkerPostIds(req.getWorkerNo(), post11Enum, post21Enum);
            Customer workerByNo = customerService.getOne(
                    Wrappers.<Customer>lambdaUpdate().eq(Customer::getWorkerNo, req.getWorkerNo()).last("LIMIT 1")
            );

            LambdaUpdateWrapper<Customer> wrapper = Wrappers.<Customer>lambdaUpdate().eq(Customer::getCustomerId, validCustomer.getCustomerId());
            for (String postId : bindWorkerPostIds) {
                if (postId.equals(post11Enum.getCode().toString())) {
                    wrapper.set(Customer::getClassWorkerId, workerByNo.getCustomerId());
                } else if (postId.equals(post21Enum.getCode().toString())) {
                    wrapper.set(Customer::getConsultWorkerId, workerByNo.getCustomerId());
                }
            }

            // 修改用户信息
            Boolean update = customerService.update(wrapper);
        }

        // 验证码通过
        sysSmsInfoService.validateSmsInfo(req);





        // 组装返回结果
        return new SuccessResponseData<>(customerLoginBizService.phoneLogin(req.getPhone(), CustomerUserTypeEnum.USER));
@@ -295,6 +326,9 @@
        String md5Salt = AuthConfigExpander.getMd5Salt();
        String phoneMd5 = MD5.create().digestHex(md5Salt + req.getPhone());
        Assert.isTrue(phoneMd5.equals(req.getPhoneMd5()), "手机号验证失败");




        // 组装返回结果
        return new SuccessResponseData<>(customerLoginBizService.phoneLogin(req.getPhone(), CustomerUserTypeEnum.USER));
@@ -312,12 +346,13 @@
    @ApiImplicitParams({
            @ApiImplicitParam(name = "pageNo", value = "分页：第几页（从1开始）", dataTypeClass = Integer.class, paramType = "query"),
            @ApiImplicitParam(name = "pageSize", value = "分页：每页大小（默认10）", dataTypeClass = Integer.class, paramType = "query"),
            @ApiImplicitParam(name = "title", value = "帮助内容", dataTypeClass = Integer.class, paramType = "query")
            @ApiImplicitParam(name = "title", value = "标题", dataTypeClass = String.class, paramType = "query"),
            @ApiImplicitParam(name = "content", value = "内容", dataTypeClass = String.class, paramType = "query")
    } )
    public ResponseData<PageResult<Help>> page(Integer pageNo, Integer pageSize,String title) {
        LambdaQueryWrapper<Help> lambdaQueryWrapper = new LambdaQueryWrapper<Help>().eq(Help::getIsDelete,false)
                .orderByAsc(Help::getSort);
        lambdaQueryWrapper.like(StrUtil.isNotBlank(title),Help::getTitle,title).or().like(StrUtil.isNotBlank(title),Help::getContent,title);
    public ResponseData<PageResult<Help>> page(Integer pageNo, Integer pageSize, String title, String content) {
        LambdaQueryWrapper<Help> lambdaQueryWrapper = new LambdaQueryWrapper<Help>().eq(Help::getIsDelete, false).orderByAsc(Help::getSort);
        lambdaQueryWrapper.like(StrUtil.isNotBlank(title), Help::getTitle, title);
        lambdaQueryWrapper.like(StrUtil.isNotBlank(content), Help::getContent, content);
        Page<Help> page = this.helpService.page(PageFactory.page(pageNo, pageSize), lambdaQueryWrapper);
        return new SuccessResponseData<>(PageResultFactory.createPageResult(page));
    }