From 721418557da91c45b345db3e986a7528173c634e Mon Sep 17 00:00:00 2001
From: zhaozhengjie <237651143@qq.com>
Date: 星期五, 16 九月 2022 14:53:47 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java | 61 +++++++++++++++++++++---------
1 files changed, 43 insertions(+), 18 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 47e13a6..e93e048 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
@@ -4,6 +4,7 @@
import javax.annotation.Resource;
+import cn.hutool.core.util.StrUtil;
import com.panzhihua.common.model.dtos.DataKanBansDto;
import com.panzhihua.common.model.dtos.community.convenient.ConvenientMerchantDTO;
import com.panzhihua.common.model.dtos.community.convenient.DisableOrEnableConvenientMerchantDTO;
@@ -56,8 +57,8 @@
*/
@PostMapping("/addOrUpdate")
public R addOrUpdate(@RequestParam("openid") String openid, @RequestParam("sessionKey") String sessionKey,
- @RequestParam("unionid") String unionid) {
- return userService.updateInsertUser(openid, sessionKey, unionid);
+ @RequestParam("unionid") String unionid,@RequestParam("appId")String appId) {
+ return userService.updateInsertUser(openid, sessionKey, unionid,appId);
}
/**
@@ -103,10 +104,13 @@
*/
@PostMapping("/getUserInfo")
public R<LoginUserInfoVO> getUserInfo(@RequestParam("userName") String userName) {
- int index = userName.lastIndexOf("_");
- String type = userName.substring(index + 1);
- String name = userName.substring(0, index);
- return userService.getUserInfo(name, Integer.parseInt(type));
+ int index2 = userName.lastIndexOf("_");
+ String appid=userName.substring(index2+1);
+ String username=userName.substring(0,index2);
+ int index = username.lastIndexOf("_");
+ String type = username.substring(index + 1);
+ String name = username.substring(0, index);
+ return userService.getUserInfo(name, Integer.parseInt(type),appid);
}
/**
@@ -564,8 +568,8 @@
* @return 协议内容
*/
@PostMapping("useragreement")
- public R userAgreement(@RequestParam("type") int type) {
- return userService.userAgreement(type);
+ public R userAgreement(@RequestParam("type") int type,@RequestParam("appid")String appId) {
+ return userService.userAgreement(type,appId);
}
/**
@@ -721,8 +725,8 @@
* @return 协议内容
*/
@PostMapping("agreement")
- public R agreement(@RequestParam("type") Integer type) {
- return userService.agreement(type);
+ public R agreement(@RequestParam("type") Integer type,@RequestParam("appId")String appId) {
+ return userService.agreement(type,appId);
}
/**
@@ -1367,8 +1371,8 @@
@GetMapping("/indexData/totalData")
public R indexData(@RequestParam(value = "type",required = false) Integer type,
@RequestParam(value = "streetId",required = false) Long streetId,
- @RequestParam(value = "areaCode",required = false) Long areaCode){
- return userService.newIndexData(type,streetId,areaCode);
+ @RequestParam(value = "areaCode",required = false) Long areaCode,@RequestParam("appId")String appId){
+ return userService.newIndexData(type,streetId,areaCode,appId);
}
/**
@@ -1379,8 +1383,8 @@
public R userRate(@RequestParam(value = "type",required = false) Integer type,
@RequestParam(value = "streetId",required = false) Long streetId,
@RequestParam(value = "areaCode",required = false) Long areaCode,
- @RequestParam(value = "range",required = false) Integer range){
- return userService.userRate(type,streetId,areaCode,range);
+ @RequestParam(value = "range",required = false) Integer range,@RequestParam("appId")String appId){
+ return userService.userRate(type,streetId,areaCode,range,appId);
}
/**
@@ -1391,8 +1395,8 @@
public R realUser(@RequestParam(value = "type",required = false) Integer type,
@RequestParam(value = "streetId",required = false) Long streetId,
@RequestParam(value = "areaCode",required = false) Long areaCode,
- @RequestParam(value = "range",required = false) Integer range){
- return userService.realUser(type,streetId,areaCode,range);
+ @RequestParam(value = "range",required = false) Integer range,@RequestParam(value = "appId",required = false)String appId){
+ return userService.realUser(type,streetId,areaCode,range,appId);
}
@@ -1400,8 +1404,9 @@
public R userActivity(@RequestParam(value = "type",required = false) Integer type,
@RequestParam(value = "streetId",required = false) Long streetId,
@RequestParam(value = "areaCode",required = false) Long areaCode,
- @RequestParam(value = "range",required = false) Integer range){
- return userService.userActivity(type,streetId,areaCode,range);
+ @RequestParam(value = "range",required = false) Integer range,
+ @RequestParam(value = "appId",required = false) String appId){
+ return userService.userActivity(type,streetId,areaCode,range, appId);
}
@@ -1430,4 +1435,24 @@
public R getAreaAndStreet(){
return userService.getAreaAndStreet();
}
+
+ @GetMapping("/communityList")
+ public R getCommunityList(@RequestParam("name") String name, @RequestParam(value = "id",required = false) Long id){
+ return userService.getCommunityList(name,id);
+ }
+
+ @GetMapping("/resetPasswordAccount")
+ public R resetPasswordAccount(@RequestParam("type")Integer type,@RequestParam("account")String account,@RequestParam("appId")String appId){
+ return userService.resetPassword(type,account,appId);
+ }
+
+ @PostMapping("/tfLogin")
+ public R tfLogin(@RequestBody UuLoginVO uuLoginVO){
+ return userService.tfLogin(uuLoginVO);
+ }
+
+ @GetMapping("/accept")
+ public R accept(@RequestParam("userId")Long userId){
+ return userService.accept(userId);
+ }
}
--
Gitblit v1.7.1