4.22

luodangjia

2024-04-22 3d3d9195b8c9e71af367cf78c7736d95e7e1b894

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

@@ -13,9 +13,11 @@
import cn.stylefeng.guns.modular.business.dto.request.CustomerWxOpenIdLoginRequest;
import cn.stylefeng.guns.modular.business.entity.Help;
import cn.stylefeng.guns.modular.business.entity.MentalTestRecord;
import cn.stylefeng.guns.modular.business.entity.Version;
import cn.stylefeng.guns.modular.business.service.IAreaService;
import cn.stylefeng.guns.modular.business.service.IHelpService;
import cn.stylefeng.guns.modular.business.service.IMentalTestRecordService;
import cn.stylefeng.guns.modular.business.service.IVersionService;
import cn.stylefeng.rest.modular.user.service.CustomerLoginBizService;
import cn.stylefeng.roses.kernel.auth.api.AuthServiceApi;
import cn.stylefeng.roses.kernel.auth.api.context.LoginContext;
@@ -99,6 +101,15 @@

    @Resource
    private IAreaService areaService;
    @Resource
    private IVersionService versionService;

    @ApiOperation(value = "获取当前最新版本")
    @PostResource(name = "获取当前最新版本", path = RuleConstants.NOT_LOGIN +"/newversion")
    public ResponseData<Version> newversion() {
        Version one = versionService.getOne(Wrappers.lambdaQuery(Version.class).orderByDesc(Version::getCreateTime).eq(Version::getIsDelete, 0).last("limit 1"));
        return new SuccessResponseData<>(one);
    }

    @ApiOperation(value = "获取微信openId")
    @GetResource(name = "获取微信openId", path = RuleConstants.NOT_LOGIN + "/getWxOpenId", requiredPermission = false, requiredLogin = false)
@@ -171,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());
            }
        }

@@ -268,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));
@@ -285,6 +327,9 @@
        String phoneMd5 = MD5.create().digestHex(md5Salt + req.getPhone());
        Assert.isTrue(phoneMd5.equals(req.getPhoneMd5()), "手机号验证失败");




        // 组装返回结果
        return new SuccessResponseData<>(customerLoginBizService.phoneLogin(req.getPhone(), CustomerUserTypeEnum.USER));
    }