From 5289e9842a8889f4128d95501ae80e1e93f4d6ac Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Sun, 26 Sep 2021 17:35:41 +0800 Subject: [PATCH] fix --- src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java index 6ffc601..c1ede1b 100644 --- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java +++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java @@ -55,6 +55,17 @@ } /** + * 订单列表-取消订单 + * @param id + * @return + */ + @GetMapping("cancelOrder/{id}") + @ControllerEndpoint(operation = "订单列表-取消订单", exceptionMessage = "操作失败") + public FebsResponse cancelOrder(@NotNull(message = "{required}") @PathVariable Long id) { + return adminMallOrderService.cancelOrder(id); + } + + /** * 订单退款-列表 * @param mallOrderRefundDto * @param request @@ -171,6 +182,27 @@ return adminMallOrderService.withAddressUpdate(withAddressUpdateDto); } + /** + * 商家支付方式-列表 + * @param payMethodDto + * @param request + * @return + */ + @GetMapping("payMethodList") + public FebsResponse getPayMethodList(PayMethodDto payMethodDto, QueryRequest request) { + Map<String, Object> data = getDataTable(adminMallOrderService.getPayMethodListInPage(payMethodDto, request)); + return new FebsResponse().success().data(data); + } + + /** + * 商家支付方式-更新 + */ + @PostMapping("payMethodEdit") + @ControllerEndpoint(operation = "商家支付方式-更新", exceptionMessage = "操作失败") + public FebsResponse payMethodEdit(@Valid PayMethodEditDto payMethodEditDto) { + return adminMallOrderService.payMethodEdit(payMethodEditDto); + } + -- Gitblit v1.9.1