diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/controller/admin/OrderController.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/controller/admin/OrderController.java index 4d84fdb30..9d0cca920 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/controller/admin/OrderController.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/controller/admin/OrderController.java @@ -50,7 +50,7 @@ public class OrderController { @Operation(summary = "订单详情") @GetMapping("/{orderId}") public Result getOrderDetail( - @Parameter(name ="订单ID") @PathVariable Long orderId + @Parameter(description ="订单ID") @PathVariable Long orderId ) { OrderDTO orderDTO = new OrderDTO(); // 订单 diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/controller/app/AppOrderController.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/controller/app/AppOrderController.java index 837a89511..d9bf558fa 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/controller/app/AppOrderController.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/controller/app/AppOrderController.java @@ -40,7 +40,7 @@ public class AppOrderController { @Operation(summary = "订单确认", description = "进入订单确认页面有两个入口,1:立即购买;2:购物车结算") @PostMapping("/confirm") public Result confirmOrder( - @Parameter(name ="立即购买必填,购物车结算不填") @RequestParam(required = false) Long skuId + @Parameter(description ="立即购买必填,购物车结算不填") @RequestParam(required = false) Long skuId ) { OrderConfirmVO result = orderService.confirmOrder(skuId); return Result.success(result); diff --git a/mall-product/product-boot/src/main/java/com/youlai/mall/product/controller/admin/BrandController.java b/mall-product/product-boot/src/main/java/com/youlai/mall/product/controller/admin/BrandController.java index 2c7021123..ff8e21c08 100644 --- a/mall-product/product-boot/src/main/java/com/youlai/mall/product/controller/admin/BrandController.java +++ b/mall-product/product-boot/src/main/java/com/youlai/mall/product/controller/admin/BrandController.java @@ -1,15 +1,11 @@ package com.youlai.mall.product.controller.admin; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.youlai.common.result.PageResult; import com.youlai.common.result.Result; import com.youlai.common.web.model.Option; import com.youlai.mall.product.model.entity.Brand; -import com.youlai.mall.product.model.query.BrandCategoryQuery; import com.youlai.mall.product.model.query.BrandPageQuery; -import com.youlai.mall.product.model.vo.BrandCategoryVO; import com.youlai.mall.product.model.vo.BrandPageVO; import com.youlai.mall.product.service.BrandCategoryService; import com.youlai.mall.product.service.BrandService; @@ -79,21 +75,23 @@ public class BrandController { @Operation(summary = "删除品牌") @DeleteMapping("/{ids}") public Result deleteBrands( - @Parameter(name = "品牌ID,多个以英文逗号(,)分割") @PathVariable("ids") String ids + @Parameter(description = "品牌ID,多个以英文逗号(,)分割") @PathVariable("ids") String ids ) { boolean status = brandService.removeByIds(Arrays.asList(ids.split(","))); return Result.judge(status); } - @Operation(summary = "获取品牌分类关联列表") - @GetMapping("/{brandId}/brand-categories") - public Result> listBrandCategories(BrandCategoryQuery queryParams) { - List list = brandCategoryService.listBrandCategories(queryParams); - return Result.success(list); + @Operation(summary = "获取品牌关联的分类列表") + @GetMapping("/{brandId}/categories") + public Result> listBrandCategories( + @Parameter(description = "品牌ID") @PathVariable Long brandId + ) { + List