From 33297d7db5f8dd474ab9ae71d93299cfe9922260 Mon Sep 17 00:00:00 2001 From: chen-xin-zhi <3588068430@qq.com> Date: Sat, 9 Nov 2024 01:20:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BA=86=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E7=AB=AF=E7=94=A8=E6=88=B7=E5=88=9B=E5=BB=BA=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../heritage/controller/file/FileController.java | 6 +++--- .../heritage/controller/good/CouponController.java | 2 +- .../heritage/controller/good/GoodController.java | 5 +---- .../heritage/controller/user/UserController.java | 10 +++++----- .../heritage/model/dto/cart/CartRecordAddRequest.java | 2 +- .../heritage/model/dto/good/GoodUpdateRequest.java | 2 +- 6 files changed, 12 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/cultural/heritage/controller/file/FileController.java b/src/main/java/com/cultural/heritage/controller/file/FileController.java index 27c98da..3ca7f53 100644 --- a/src/main/java/com/cultural/heritage/controller/file/FileController.java +++ b/src/main/java/com/cultural/heritage/controller/file/FileController.java @@ -48,7 +48,7 @@ public class FileController { * @return 图片可访问地址 */ @PostMapping("/upload/server/not_login") - @Operation(summary = "未登录情况下的文件上传", description = "参数：文件对象（multipartFile), 业务类型(biz)，权限：所有人，方法名：uploadServerFileNotLogin") + @Operation(summary = "未登录情况下的文件上传", description = "参数：(文档上是false，但biz是必传的)，文件对象（multipartFile), 业务类型(biz)，权限：所有人，方法名：uploadServerFileNotLogin") private BaseResponse uploadServerFileNotLogin(@RequestPart("file")MultipartFile multipartFile, UploadFileRequest uploadFileRequest) { //获取业务名称 String biz = uploadFileRequest.getBiz(); @@ -79,8 +79,8 @@ public class FileController { @PostMapping("/upload/server") - @Operation(summary = "已登录情况下的文件上传", description = "参数：文件对象（multipartFile), 业务类型(biz)，权限：所有人，方法名：uploadServerFile") - public BaseResponse uploadServerFile(@RequestPart MultipartFile multipartFile, UploadFileRequest uploadFileRequest, HttpServletRequest request) { + @Operation(summary = "已登录情况下的文件上传", description = "参数：(文档上是false，但biz是必传的)，文件对象（multipartFile), 业务类型(biz)，权限：所有人，方法名：uploadServerFile") + public BaseResponse uploadServerFile(@RequestPart("file")MultipartFile multipartFile, UploadFileRequest uploadFileRequest, HttpServletRequest request) { //获取业务名称 String biz = uploadFileRequest.getBiz(); FileUploadBizEnum fileUploadBizEnum = FileUploadBizEnum.getEnumByValue(biz); diff --git a/src/main/java/com/cultural/heritage/controller/good/CouponController.java b/src/main/java/com/cultural/heritage/controller/good/CouponController.java index 0bcf016..5ed8ad3 100644 --- a/src/main/java/com/cultural/heritage/controller/good/CouponController.java +++ b/src/main/java/com/cultural/heritage/controller/good/CouponController.java @@ -123,7 +123,7 @@ public class CouponController { * @return 优惠券列表 */ @PostMapping("/list/page") - @Operation(summary = "Web端管理员分页查询优惠券", description = "参数：优惠券查询请求体, 排序字段 sortField: conditionAmount requirePoints totalNum residueNum limitNum，权限：管理员(admin, boss)，方法名：listCouponVOByPage") + @Operation(summary = "Web端管理员分页查询优惠券", description = "参数：优惠券查询请求体, 排序字段 sortField: conditionAmount requirePoints totalNum residueNum limitNum id，权限：管理员(admin, boss)，方法名：listCouponVOByPage") @AuthCheck(mustRole = UserConstant.ADMIN_ROLE) public BaseResponse> listCouponVOByPage(@RequestBody CouponQueryRequest couponQueryRequest) { if (couponQueryRequest == null) { diff --git a/src/main/java/com/cultural/heritage/controller/good/GoodController.java b/src/main/java/com/cultural/heritage/controller/good/GoodController.java index 76e962f..0d6ac17 100644 --- a/src/main/java/com/cultural/heritage/controller/good/GoodController.java +++ b/src/main/java/com/cultural/heritage/controller/good/GoodController.java @@ -16,7 +16,6 @@ import com.cultural.heritage.model.dto.good.GoodAddRequest; import com.cultural.heritage.model.dto.good.GoodQueryRequest; import com.cultural.heritage.model.dto.good.GoodUpdateRequest; import com.cultural.heritage.model.entity.Good; -import com.cultural.heritage.service.good.CategoryService; import com.cultural.heritage.service.good.GoodService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -44,8 +43,6 @@ public class GoodController { private GoodService goodService; - @Resource - private CategoryService categoryService; /** @@ -114,7 +111,7 @@ public class GoodController { * @return 商品信息列表 */ @PostMapping("/list/page") - @Operation(summary = "Web端管理员分页查询商品", description = "参数：商品查询请求体，排序字段 sortField: price inventory，权限：管理员(admin, boss)，方法名：listGoodByPage") + @Operation(summary = "Web端管理员分页查询商品", description = "参数：商品查询请求体，排序字段 sortField: price inventory id，权限：管理员(admin, boss)，方法名：listGoodByPage") @AuthCheck(mustRole = UserConstant.ADMIN_ROLE) public BaseResponse> listGoodByPage(@RequestBody GoodQueryRequest goodQueryRequest) { long current = goodQueryRequest.getCurrent(); diff --git a/src/main/java/com/cultural/heritage/controller/user/UserController.java b/src/main/java/com/cultural/heritage/controller/user/UserController.java index e52fb11..c790ff5 100644 --- a/src/main/java/com/cultural/heritage/controller/user/UserController.java +++ b/src/main/java/com/cultural/heritage/controller/user/UserController.java @@ -83,7 +83,7 @@ public class UserController { * @return 用户登录信息 */ @GetMapping("/login/wx_open") - @Operation(summary = "微信小程序用户登录", description = "参数：code(用户登录凭证), 权限：所有人, 方法名：userLoginByWxOpen") + @Operation(summary = "(无法测)微信小程序用户登录", description = "参数：code(用户登录凭证), 权限：所有人, 方法名：userLoginByWxOpen") public BaseResponse userLoginByWxOpen(@RequestParam("code") String code, HttpServletRequest request) { WxMaJscode2SessionResult sessionInfo; try { @@ -218,7 +218,7 @@ public class UserController { * @return 用户信息 */ @GetMapping("/get") - @Operation(summary = "Web端管理员根据id获取用户信息", description = "参数：用户id, 权限：管理员(admin, boss), 方法名：getUserById") + @Operation(summary = "(未使用)Web端管理员根据id获取用户信息", description = "参数：用户id, 权限：管理员(admin, boss), 方法名：getUserById") @AuthCheck(mustRole = UserConstant.ADMIN_ROLE) public BaseResponse getUserById(long id) { if (id <= 0) { @@ -234,7 +234,7 @@ public class UserController { * 获取用户数量 */ @GetMapping("/count") - @Operation(summary = "Web端管理员获取用户数量", description = "参数：无, 权限：管理员(admin, boss), 方法名：getUserCount") + @Operation(summary = "(未使用)Web端管理员获取用户数量", description = "参数：无, 权限：管理员(admin, boss), 方法名：getUserCount") @AuthCheck(mustRole = UserConstant.ADMIN_ROLE) public BaseResponse getUserCount() { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -251,7 +251,7 @@ public class UserController { * @return 用户信息列表 */ @PostMapping("/list/page") - @Operation(summary = "Web端管理员分页获取用户信息", description = "参数：用户查询请求体, 排序字段 sortField: points，权限：管理员(admin, boss), 方法名：listUserByPage") + @Operation(summary = "Web端管理员分页获取用户信息", description = "参数：用户查询请求体, 排序字段 sortField: points id，权限：管理员(admin, boss), 方法名：listUserByPage") @AuthCheck(mustRole = UserConstant.ADMIN_ROLE) public BaseResponse> listUserByPage(@RequestBody UserQueryRequest userQueryRequest) { long current = userQueryRequest.getCurrent(); @@ -270,7 +270,7 @@ public class UserController { * @return 脱敏用户信息列表 */ @PostMapping("/list/page/vo") - @Operation(summary = "Web端管理员分页获取脱敏用户信息", description = "参数：用户查询请求体, 排序字段 sortField: points， 权限：管理员(admin, boss), 方法名：listUserVOByPage") + @Operation(summary = "(未使用)Web端管理员分页获取脱敏用户信息", description = "参数：用户查询请求体, 排序字段 sortField: points id， 权限：管理员(admin, boss), 方法名：listUserVOByPage") @AuthCheck(mustRole = UserConstant.ADMIN_ROLE) public BaseResponse> listUserVOByPage(@RequestBody UserQueryRequest userQueryRequest) { if (userQueryRequest == null) { diff --git a/src/main/java/com/cultural/heritage/model/dto/cart/CartRecordAddRequest.java b/src/main/java/com/cultural/heritage/model/dto/cart/CartRecordAddRequest.java index 390037f..0fbc6dc 100644 --- a/src/main/java/com/cultural/heritage/model/dto/cart/CartRecordAddRequest.java +++ b/src/main/java/com/cultural/heritage/model/dto/cart/CartRecordAddRequest.java @@ -7,7 +7,7 @@ import java.io.Serial; import java.io.Serializable; @Data -@Schema(description = "购物车记录添加请求体", requiredProperties = {"userId", "goodId", "quantity", "subtotal"}) +@Schema(description = "购物车记录添加请求体", requiredProperties = {"userId", "goodId", "quantity", "subtotal", "isGoodType"}) public class CartRecordAddRequest implements Serializable { /** diff --git a/src/main/java/com/cultural/heritage/model/dto/good/GoodUpdateRequest.java b/src/main/java/com/cultural/heritage/model/dto/good/GoodUpdateRequest.java index 9a75d62..8d5e1ed 100644 --- a/src/main/java/com/cultural/heritage/model/dto/good/GoodUpdateRequest.java +++ b/src/main/java/com/cultural/heritage/model/dto/good/GoodUpdateRequest.java @@ -8,7 +8,7 @@ import java.io.Serializable; @Data @Schema(description = "商品更新请求体", requiredProperties = {"id", "name", "type", "price", "goodImg", "intro", - "introDetail, detailImg", "label", "inventory", "festivalOrder"}) + "introDetail", "detailImg", "label", "inventory", "festivalOrder", "isShelves"}) public class GoodUpdateRequest implements Serializable { /**