From c6f8a03a3675efa99a833e16ad34ac0dd0fbc9b0 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期三, 20 九月 2023 17:55:29 +0800
Subject: [PATCH] 1.扫码开门 2. 修改bug
---
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/api/UnionUserApi.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/api/UnionUserApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/api/UnionUserApi.java
index 0bcb92b..6957a76 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/api/UnionUserApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/api/UnionUserApi.java
@@ -53,12 +53,14 @@
public R authentication(@RequestBody UnionUserDto unionUserDto, @CurrentUser UnionUserDto unionUser){
if (unionUserDto.getIsApplets().equals(1)) {
log.info("小程序进入无需验证");
- return userService.authentication(unionUserDto);}
+ return userService.authentication(unionUserDto);
+ }
else {
log.info("h5进入");
if (unionUser != null) {
unionUserDto.setId(unionUser.getId());
- return userService.authentication(unionUserDto);}
+ return userService.authentication(unionUserDto);
+ }
else {
return R.fail("请重新登录");
}
@@ -76,4 +78,20 @@
return userService.selectById(id);
}
+
+ /**
+ * 用户开门
+ *
+ * @return 总工会户外劳共用户
+ */
+ @GetMapping("/openDoor")
+ public R openDoor(@RequestParam(value = "qRCode") String qRCode,@CurrentUser UnionUserDto unionUser){
+ if (unionUser != null) {
+ return userService.openDoor(unionUser,qRCode);
+ }
+ else {
+ return R.fail("请重新登录");
+ }
+ }
+
}
--
Gitblit v1.7.1