From cf148cae4937f807347e56d94b2dc96c9f258c59 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 14 Jul 2021 15:04:48 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-user/src/main/java/com/xzx/gc/user/controller/UserController.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/gc-user/src/main/java/com/xzx/gc/user/controller/UserController.java b/gc-user/src/main/java/com/xzx/gc/user/controller/UserController.java
index 48790e2..e6cc4ca 100644
--- a/gc-user/src/main/java/com/xzx/gc/user/controller/UserController.java
+++ b/gc-user/src/main/java/com/xzx/gc/user/controller/UserController.java
@@ -31,6 +31,7 @@
import com.xzx.gc.user.dto.*;
import com.xzx.gc.user.mapper.*;
import com.xzx.gc.user.service.*;
+import com.xzx.gc.user.vo.UserIdentityVo;
import com.xzx.gc.util.DoubleUtil;
import com.xzx.gc.util.SessionUtil;
import io.swagger.annotations.*;
@@ -204,6 +205,11 @@
return result;
}
+ @ApiOperation(value = "获取用户身份状态")
+ @PostMapping("/user/query/userIdentity")
+ public JsonResult<UserIdentityVo> userIdentity(HttpServletRequest request) {
+ return JsonResult.success(userService.userIdentity(getUserId(request)));
+ }
/**
* 验证支付密码
@@ -467,7 +473,6 @@
@ApiImplicitParam(paramType="query", name = "userType", value = "用户类型(1为普通用户,2为回收员,3为代丢员,4入库员,5运营员)", required = true, dataType = "String"),
@ApiImplicitParam(paramType="query", name = "mobilePhone", value = "手机号", required = true, dataType = "String")
})
-// @ApiResponses({@ApiResponse( code = 200, message = "success", response = UserModel.class)})
public JsonResult<Map<String, Object>> queryUserApiList(@RequestBody UserModel userModel){
Map<String, Object> map = userService.queryCuserForTimeList(userModel);
return JsonResult.success(map);
--
Gitblit v1.9.1