From 2bd9debe1829fdce93c62028aa97716a1cb2defe Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期二, 19 九月 2023 10:34:22 +0800
Subject: [PATCH] 一帕拉功能（一边想四月里大哥一边写的）
---
springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huacheng_union_applets/api/UnionUserApi.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huacheng_union_applets/api/UnionUserApi.java b/springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huacheng_union_applets/api/UnionUserApi.java
index 7540965..3f96ad3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huacheng_union_applets/api/UnionUserApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huacheng_union_applets/api/UnionUserApi.java
@@ -1,25 +1,22 @@
-package com.chuangongzhijia.huacheng_union_applets.api;
+package com.chuangongzhijia.huachengunion_applets.api;
-import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.equipment.UnionUserDto;
-import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.community.ComActDpcVO;
import com.panzhihua.common.service.community.CommunityUnionService;
import com.panzhihua.common.service.user.UserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
+import io.swagger.annotations.ApiImplicitParam;
import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
@Slf4j
@Api(tags = {"用户相关"})
@RestController
@RequestMapping("/unionUser")
-public class UnionUserApi extends BaseController {
+public class UnionUserApi {
@Resource
private CommunityUnionService communityUnionService;
@@ -30,13 +27,13 @@
/**
* 总工会户外劳登录
*
+ *
* @return 总工会户外劳共用户
*/
- @ApiOperation(value = "总工会户外劳登录")
- @PostMapping("/login")
- public R login(){
- LoginUserInfoVO userInfoByUserId = userService.getUserInfoByUserId("1588095866109984769").getData();
- return communityUnionService.unionUserLogin(userInfoByUserId);
+ @ApiOperation(value = "总工会户外劳登录(H5)")
+ @GetMapping("/login")
+ public R login(@RequestParam(value = "phone") String phone){
+ return communityUnionService.unionUserLoginH5(phone);
}
/**
@@ -45,9 +42,11 @@
* @param unionUserDto
* @return 总工会户外劳共用户
*/
+
@ApiOperation(value = "总工会户外劳工站用户认证")
@PostMapping("/authentication")
public R authentication(@RequestBody UnionUserDto unionUserDto){
+ unionUserDto.setIsApplets(3);
return communityUnionService.unionUserAuthentication(unionUserDto);
}
--
Gitblit v1.7.1