From c6e9ccc99a191d61b9599629702f84f495516095 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期日, 09 十月 2022 09:34:46 +0800
Subject: [PATCH] 用户信息增加登陆用户是否为三说会堂专家
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java | 96 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 78 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 e9f27ab..5558977 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,12 +4,14 @@
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;
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 com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@@ -56,8 +58,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 +105,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 +569,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 +726,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 +1372,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 +1384,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 +1396,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 +1405,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);
}
@@ -1413,8 +1419,62 @@
return userService.checkExport(account,password,oldPassword);
}
+ /**
+ * uu洗车推送
+ * @param washPhone
+ * @param phone
+ * @param washName
+ * @param orderStatus
+ * @return
+ */
+ @GetMapping("/uuPush")
+ public R uuPush(@RequestParam(value = "washPhone",required = false)String washPhone,@RequestParam("phone")String phone,@RequestParam(value = "washName",required = false)String washName,@RequestParam("orderStatus")Integer orderStatus){
+ return userService.uuPush(washPhone,phone,washName,orderStatus);
+ }
+
@GetMapping("/indexData/getAreaAndStreet")
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);
+ }
+
+ /**
+ * 三说会堂新增业务中心或专家账号
+ * */
+ @PostMapping("/sanshuoAddUser")
+ public R sanshuoAddUser(@RequestBody AdministratorsUserVO administratorsUserVO){
+ return userService.addExpertOrIndustryCenter(administratorsUserVO);
+ }
+
+ /**
+ * 三说会堂后台重置密码
+ * */
+ @GetMapping("/sanshuoResetPassword")
+ public R sanshuoAddUser(@RequestParam("account") String account,@RequestParam("pass")String password){
+ return userService.resetPassExpertOrIndustryCenter(account,password);
+ }
+
+ /**
+ * 移除账号专家权限
+ *
+ */
+ @GetMapping("/removeExpertRole")
+ public R removeExpertRole(@RequestParam(value = "phone",required = false)String phone){
+ return userService.removeExpertRole(phone);
+ }
+
}
--
Gitblit v1.7.1