From 19c3da86d8c6adcb91baccac6981c63307e3dba1 Mon Sep 17 00:00:00 2001 From: KKSU <15274802129@163.com> Date: Fri, 20 Dec 2024 13:01:12 +0800 Subject: [PATCH] fix(mall): 修复会员提现状态更新逻辑 --- src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsCategoryController.java | 89 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 88 insertions(+), 1 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsCategoryController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsCategoryController.java index cd8b4b0..33ed194 100644 --- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsCategoryController.java +++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsCategoryController.java @@ -5,9 +5,10 @@ import cc.mrbird.febs.common.entity.FebsResponse; import cc.mrbird.febs.common.entity.QueryRequest; import cc.mrbird.febs.mall.entity.MallGoodsCategory; +import cc.mrbird.febs.mall.entity.MallStore; +import cc.mrbird.febs.mall.entity.MallStoreItem; import cc.mrbird.febs.mall.service.IAdminMallGoodsCategoryService; import cc.mrbird.febs.mall.service.IApiMallGoodsCategoryService; -import cc.mrbird.febs.mall.vo.AdminAddAddressTreeVo; import cc.mrbird.febs.mall.vo.AdminMallGoodsCategoryTreeVo; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -30,6 +31,87 @@ private final IApiMallGoodsCategoryService mallGoodsCategoryService; /** + * 机器列表 + */ + @GetMapping("storeItemList") + public FebsResponse storeItemList(MallStoreItem mallStoreItem, QueryRequest request) { + Map<String, Object> data = getDataTable(goodsCategoryService.storeItemList(mallStoreItem, request)); + return new FebsResponse().success().data(data); + } + + /** + * 机器-选择 + */ + @GetMapping("storeItem/tree") + @ControllerEndpoint(exceptionMessage = "获取分类失败") + public FebsResponse getStore(){ + return new FebsResponse().success().data(goodsCategoryService.getStore()); + } + + /** + * 机器-新增 + */ + @PostMapping("addStoreItem") + @ControllerEndpoint(operation = "机器-新增", exceptionMessage = "操作失败") + public FebsResponse addStoreItem(@Valid MallStoreItem mallStoreItem) { + return goodsCategoryService.addStoreItem(mallStoreItem); + } + + /** + * 机器-编辑 + */ + @PostMapping("updateStoreItem") + @ControllerEndpoint(operation = "机器-编辑", exceptionMessage = "操作失败") + public FebsResponse updateStoreItem(@Valid MallStoreItem mallStoreItem) { + return goodsCategoryService.updateStoreItem(mallStoreItem); + } + + /** + * 机器-删除 + */ + @GetMapping("delStoreItem/{id}") + @ControllerEndpoint(operation = "机器-删除", exceptionMessage = "操作失败") + public FebsResponse delStoreItem(@NotNull(message = "{required}") @PathVariable Long id) { + return goodsCategoryService.delStoreItem(id); + } + + /** + * 店铺列表 + */ + @GetMapping("storeList") + public FebsResponse storeList(MallStore mallStore, QueryRequest request) { + Map<String, Object> data = getDataTable(goodsCategoryService.storeList(mallStore, request)); + return new FebsResponse().success().data(data); + } + + /** + * 店铺-新增 + */ + @PostMapping("addStore") + @ControllerEndpoint(operation = "店铺-新增", exceptionMessage = "操作失败") + public FebsResponse addStore(@Valid MallStore mallStore) { + return goodsCategoryService.addStore(mallStore); + } + + /** + * 店铺-编辑 + */ + @PostMapping("updateStore") + @ControllerEndpoint(operation = "店铺-编辑", exceptionMessage = "操作失败") + public FebsResponse updateStore(@Valid MallStore mallStore) { + return goodsCategoryService.updateStore(mallStore); + } + + /** + * 店铺-删除 + */ + @GetMapping("delStore/{id}") + @ControllerEndpoint(operation = "店铺-删除", exceptionMessage = "操作失败") + public FebsResponse delStore(@NotNull(message = "{required}") @PathVariable Long id) { + return goodsCategoryService.delStore(id); + } + + /** * 商品分类列表 * @param mallGoodsCategory * @param request @@ -51,6 +133,11 @@ return new FebsResponse().success().data(mallGoodsCategoryService.findAllCategoryList()); } + @GetMapping(value = "/addressMYXL") + public FebsResponse addressMYXL() { + return new FebsResponse().success().data(mallGoodsCategoryService.findAllAddressList()); + } + /** * 商品分类-选择 */ -- Gitblit v1.9.1