From 689567d23a1f3333421aa35214490077b0ac9a0f Mon Sep 17 00:00:00 2001
From: guohongjin <guohongjin@test.com>
Date: 星期日, 28 四月 2024 10:52:18 +0800
Subject: [PATCH] 修改预约提示
---
rest/src/main/java/cn/stylefeng/rest/modular/worker/controller/WorkerController.java | 55 +++++++++++++++++++++++--------------------------------
1 files changed, 23 insertions(+), 32 deletions(-)
diff --git a/rest/src/main/java/cn/stylefeng/rest/modular/worker/controller/WorkerController.java b/rest/src/main/java/cn/stylefeng/rest/modular/worker/controller/WorkerController.java
index 1043b01..265bdd8 100644
--- a/rest/src/main/java/cn/stylefeng/rest/modular/worker/controller/WorkerController.java
+++ b/rest/src/main/java/cn/stylefeng/rest/modular/worker/controller/WorkerController.java
@@ -49,6 +49,7 @@
import cn.stylefeng.roses.kernel.system.api.pojo.user.SysUserDTO;
import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUser;
import cn.stylefeng.roses.kernel.system.modular.user.service.SysUserService;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -80,10 +81,10 @@
@RequestMapping("/worker")
public class WorkerController {
- @Value("${wxpay.appId}")
+ @Value("${wxpay.worker.appId}")
private String wxAppId;
- @Value("${wxpay.appSecret}")
+ @Value("${wxpay.worker.appSecret}")
private String wxSecretKey;
@Resource
@@ -178,8 +179,8 @@
return new SuccessResponseData(openId);
}
- @ApiOperation(value = "绑定微信OpenId")
- @PostResource(name = "绑定微信OpenId", path = "/bindOpenId")
+ @ApiOperation(value = "绑定/解绑微信OpenId")
+ @PostResource(name = "绑定/解绑微信OpenId", path = "/bindOpenId")
public ResponseData<Boolean> bindOpenId(@RequestBody CustomerBindOpenIdRequest req) {
// 获取当前登录用户信息
LoginUser loginUser = LoginContext.me().getLoginUser();
@@ -278,33 +279,6 @@
// 验证码通过
sysSmsInfoService.validateSmsInfo(req);
-
-// //绑定工号
-// // 幸福顾问
-// 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);
-
-
-
// 组装返回结果
return new SuccessResponseData<>(customerLoginBizService.phoneLogin(req.getPhone(), CustomerUserTypeEnum.WORKER));
}
@@ -329,11 +303,28 @@
return new SuccessResponseData<>(customerLoginBizService.phoneLogin(req.getPhone(), CustomerUserTypeEnum.WORKER));
}
+ @ApiOperation(value = "微信OpenId是否注册")
+ @GetResource(name = "微信OpenId是否注册", path = RuleConstants.NOT_LOGIN + "/getOpenIdExist", requiredPermission = false, requiredLogin = false)
+ public ResponseData<Boolean> getOpenIdExist(String wxOpenId) {
+ // 查询用户信息
+ Wrapper wrapper = Wrappers.<Customer>lambdaQuery()
+ .eq(Customer::getUserType, CustomerUserTypeEnum.WORKER.getCode())
+ .eq(Customer::getWxOpenId, wxOpenId);
+ long count = customerService.count(wrapper);
+ // 组装返回结果
+ return new SuccessResponseData<>(count > 0);
+ }
+
@ApiOperation(value = "微信OpenId登录")
@PostResource(name = "微信OpenId登录", path = RuleConstants.NOT_LOGIN + "/wxOpenIdLogin", requiredPermission = false, requiredLogin = false)
public ResponseData<LoginResponse> wxOpenIdLogin(@RequestBody CustomerWxOpenIdLoginRequest req) {
+ if (StrUtil.isNotBlank(req.getPhone())) {
+ // 验证码通过
+ sysSmsInfoService.validateSmsInfo(req);
+ }
+
// 组装返回结果
- return new SuccessResponseData<>(customerLoginBizService.wxOpenIdLogin(req.getWxOpenId(), req.getPhone(), CustomerUserTypeEnum.WORKER));
+ return new SuccessResponseData<>(customerLoginBizService.wxOpenIdLogin(req.getWxOpenId(), req.getPhone(), req.getWorkerNo(), CustomerUserTypeEnum.WORKER));
}
@ApiOperation(value = "更换手机号")
--
Gitblit v1.7.1