From 5f5ed6db2a76e626b8d11d60a09db22b238388a0 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期五, 08 七月 2022 14:37:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_zts' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
index 381637c..afe0c49 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
@@ -10,6 +10,8 @@
import com.panzhihua.common.model.dtos.community.microCommercialStreet.BindUserPhoneDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.LoginWithPhoneDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsMerchantDTO;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
import org.springframework.web.bind.annotation.*;
import com.panzhihua.common.model.dtos.PageDTO;
@@ -693,6 +695,11 @@
return userService.updateUserIsPartymember(idCard);
}
+ @PostMapping("updateuserispartymemberByPhone")
+ public R updateUserIsPartymemberByPhone(@RequestParam("phone") String phone) {
+ return userService.updateUserIsPartymemberByPhone(phone);
+ }
+
/**
* 修改用户为非党员状态
*
@@ -1346,4 +1353,26 @@
return userService.updateUserPartyStatus(userId);
}
+ @PostMapping("/uuLogin")
+ public R uuLogin(@RequestBody UuLoginVO uuLoginVO){
+ return userService.uuLogin(uuLoginVO);
+ }
+
+ @GetMapping("/indexData")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "type",value = "数据范围,1:所有区县，2：所有街道，3：所有社区，4：跟据街道筛选",dataType = "Integer"),
+ @ApiImplicitParam(name = "streetId",value = "街道ID",dataType = "Long")
+ })
+ public R indexData(@RequestParam(value = "type",required = false) Integer type,
+ @RequestParam(value = "type",required = false) Long streetId){
+ return userService.newIndexData(type,streetId);
+ }
+
+ /**
+ *导出验证密码
+ */
+ @GetMapping("/checkExport")
+ public R checkExport(@RequestParam("account")String account,@RequestParam("password")String password,@RequestParam("oldPassword")String oldPassword){
+ return userService.checkExport(account,password,oldPassword);
+ }
}
--
Gitblit v1.7.1