From 1fbd4413550ebe1b7f7a91f61bffaeb77dc23959 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期一, 26 四月 2021 14:11:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java | 37 ++++++++++++++++++++++++++++++++++---
1 files changed, 34 insertions(+), 3 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 2a2cf98..29fb0bb 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
@@ -13,6 +13,7 @@
import com.panzhihua.service_user.service.SysUserInputService;
import com.panzhihua.service_user.service.UserService;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -188,6 +189,16 @@
@PostMapping("putuserisvolunteer")
R putUserIsVolunteer(@RequestParam("phone")String phone,@RequestParam("type")int type){
return userService.putUserIsVolunteer(phone,type);
+ }
+
+ /**
+ * 修改用户志愿者状态
+ * @param userId 志愿者ID
+ * @param type 1是志愿者 0 不是
+ */
+ @PostMapping("putuserisvolunteerbyid")
+ R putUserIsVolunteerById(@RequestParam("userId")Long userId,@RequestParam("type")int type){
+ return userService.putUserIsVolunteerById(userId, type);
}
/**
@@ -747,12 +758,32 @@
}
/**
- * 通过账号和渠道查询用户信息
- * @param storeVO
- * @return
+ * 创建SysUser用户信息以及权限
+ * @param storeVO 请求参数
+ * @return 创建结果
*/
@PostMapping("addSysUser")
public R addSysUser(@RequestBody ShopStoreVO storeVO){
return userService.addSysUser(storeVO);
}
+
+ /**
+ * 修改SysUser用户信息
+ * @param storeVO 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("editSysUser")
+ public R editSysUser(@RequestBody ShopStoreVO storeVO){
+ return userService.editSysUser(storeVO);
+ }
+
+ /**
+ * 修改用户小程序首页活动提示
+ * @param userEditTipsDTO 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("editUserTips")
+ public R editUserTips(@RequestBody SysUserEditTipsDTO userEditTipsDTO) {
+ return userService.editUserTips(userEditTipsDTO);
+ }
}
--
Gitblit v1.7.1