From 0c13dd6a75be38f540a6080b706e6cdeaab62d3e Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期四, 18 四月 2024 22:21:45 +0800 Subject: [PATCH] 4.18 --- rest/src/main/java/cn/stylefeng/rest/modular/user/controller/UserCenterController.java | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/rest/src/main/java/cn/stylefeng/rest/modular/user/controller/UserCenterController.java b/rest/src/main/java/cn/stylefeng/rest/modular/user/controller/UserCenterController.java index 1572b18..84f38e2 100644 --- a/rest/src/main/java/cn/stylefeng/rest/modular/user/controller/UserCenterController.java +++ b/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()); } } -- Gitblit v1.7.1