From 20c13d0919cd512e8fa5fff51568473662238153 Mon Sep 17 00:00:00 2001
From: goupan <goupan@chinapopin.com>
Date: 星期三, 24 四月 2024 17:45:38 +0800
Subject: [PATCH] 代码提交
---
rest/src/main/java/cn/stylefeng/rest/modular/user/controller/UserCenterController.java | 61 +++++++++++++++++++++++++++---
1 files changed, 54 insertions(+), 7 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 9cfe666..9b7bc72 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)
@@ -124,6 +135,7 @@
is.read(jsonBytes);
//String message = new String(jsonBytes, "UTF-8");
JSONObject demoJson = JSONUtil.parseObj(jsonBytes);
+ log.info("微信授权access_token：{}", JSONUtil.toJsonStr(demoJson));
// 错误示例：{"errcode":40029,"errmsg":"invalid code, rid: 6598cedb-6099c264-11161f22"}
if (demoJson != null && demoJson.containsKey("errcode")) {
log.error("获取微信openid失败！{}", demoJson);
@@ -171,13 +183,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 +283,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));
@@ -284,6 +327,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));
@@ -301,12 +347,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));
}
--
Gitblit v1.7.1