From 53e0cba6de254a1d6f19d0287da0b212f4a5ae90 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 16 七月 2024 17:22:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/web/src/main/java/com/doumee/api/web/PersonnelApi.java | 70 +++++++++++++++++++++++++++++++++++
1 files changed, 70 insertions(+), 0 deletions(-)
diff --git a/server/web/src/main/java/com/doumee/api/web/PersonnelApi.java b/server/web/src/main/java/com/doumee/api/web/PersonnelApi.java
index 3d64623..4f0fa09 100644
--- a/server/web/src/main/java/com/doumee/api/web/PersonnelApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/PersonnelApi.java
@@ -1,12 +1,20 @@
package com.doumee.api.web;
+import com.doumee.config.annotation.LoginRequired;
import com.doumee.config.annotation.UserLoginRequired;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.model.ApiResponse;
+import com.doumee.core.model.PageData;
+import com.doumee.core.model.PageWrap;
+import com.doumee.dao.business.model.Shop;
import com.doumee.dao.business.model.SmsEmail;
+import com.doumee.dao.web.reqeust.EditMemberRequest;
+import com.doumee.dao.web.reqeust.EditShopDTO;
+import com.doumee.dao.web.reqeust.EditUsersRequest;
import com.doumee.dao.web.reqeust.ContentShareImgDto;
import com.doumee.dao.web.response.AccountResponse;
import com.doumee.service.business.MemberService;
+import com.doumee.service.business.ShopService;
import com.doumee.service.business.SmsEmailService;
import com.doumee.service.business.UsersService;
import io.swagger.annotations.Api;
@@ -14,6 +22,7 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -36,6 +45,9 @@
@Autowired
public SmsEmailService smsEmailService;
+
+ @Autowired
+ public ShopService shopService;
@ApiOperation(value = "灏忕▼搴忕櫥闄�", notes = "鍛樺伐绔皬绋嬪簭")
@@ -77,6 +89,7 @@
@ApiOperation(value = "缁戝畾openid", notes = "鍛樺伐绔皬绋嬪簭")
@GetMapping("/bindingOpenid")
@ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
@ApiImplicitParam(paramType = "query", dataType = "String", name = "code", value = "寰俊code", required = true),
})
public ApiResponse bindingOpenid(@RequestParam String code) {
@@ -84,6 +97,63 @@
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
+ @UserLoginRequired
+ @ApiOperation(value = "鑾峰彇涓汉淇℃伅璇︽儏", notes = "鍛樺伐绔皬绋嬪簭")
+ @GetMapping("/getUserDetail")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse getUserDetail() {
+ usersService.usersDetail(getMemberId());
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+
+ @UserLoginRequired
+ @ApiOperation(value = "鏇存柊涓汉淇℃伅", notes = "鍛樺伐绔皬绋嬪簭")
+ @PostMapping("/editUsers")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse editUsers(@RequestBody EditUsersRequest editUsersRequest) {
+ editUsersRequest.setUserId(getMemberId());
+ usersService.editUserInfo(editUsersRequest);
+ return ApiResponse.success("鏇存柊鎴愬姛");
+ }
+
+
+ @UserLoginRequired
+ @ApiOperation(value = "闂ㄥ簵鍒嗛〉", notes = "鍛樺伐绔皬绋嬪簭")
+ @PostMapping("/shopPage")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse<PageData<Shop>> shopPage (@RequestBody PageWrap<Shop> pageWrap) {
+ return ApiResponse.success(shopService.findPage(pageWrap));
+ }
+
+ @UserLoginRequired
+ @ApiOperation(value = "闂ㄥ簵璇︽儏", notes = "鍛樺伐绔皬绋嬪簭")
+ @GetMapping("/shopDetail")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ @ApiImplicitParam(paramType = "query", dataType = "Long", name = "shopId", value = "闂ㄥ簵涓婚敭", required = true)
+ })
+ public ApiResponse<Shop> shopDetail (@RequestParam Long shopId) {
+ return ApiResponse.success(shopService.shopDetail(shopId,null));
+ }
+
+ @UserLoginRequired
+ @ApiOperation(value = "淇敼闂ㄥ簵淇℃伅", notes = "鍛樺伐绔皬绋嬪簭")
+ @GetMapping("/updShop")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse updShop(@RequestBody EditShopDTO editShopDTO) {
+ shopService.updShop(editShopDTO);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
@ApiOperation(value = "鑾峰彇涓汉鍚嶇墖", notes = "鍛樺伐绔皬绋嬪簭")
@PostMapping("/getUserCard")
public ApiResponse<String> getUserCard() {
--
Gitblit v1.9.3