From eda28374083dbb6cf58c4d1fb6794e6d261c2a45 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Thu, 23 Sep 2021 15:47:03 +0800 Subject: [PATCH] 20210923 --- src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 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 3496655..3bc41a6 100644 --- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java +++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java @@ -1,20 +1,26 @@ package cc.mrbird.febs.mall.controller; +import cc.mrbird.febs.common.annotation.ControllerEndpoint; import cc.mrbird.febs.common.controller.BaseController; import cc.mrbird.febs.common.entity.FebsResponse; import cc.mrbird.febs.common.entity.QueryRequest; +import cc.mrbird.febs.mall.dto.DeliverGoodsDto; import cc.mrbird.febs.mall.dto.MallOrderInfoDto; import cc.mrbird.febs.mall.entity.MallGoods; +import cc.mrbird.febs.mall.entity.MallGoodsCategory; import cc.mrbird.febs.mall.entity.MallOrderInfo; +import cc.mrbird.febs.mall.entity.MallOrderItem; import cc.mrbird.febs.mall.service.IAdminMallGoodsService; import cc.mrbird.febs.mall.service.IAdminMallOrderService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.validation.Valid; import java.util.Map; @Slf4j @@ -27,7 +33,7 @@ private final IAdminMallOrderService adminMallOrderService; /** - * 商品列表 + * 订单列表 * @param mallOrderInfo * @param request * @return @@ -38,6 +44,15 @@ return new FebsResponse().success().data(data); } + /** + * 订单列表-发货 + */ + @PostMapping("deliverGoods") + @ControllerEndpoint(operation = "订单列表-发货", exceptionMessage = "操作失败") + public FebsResponse deliverGoods(@Valid DeliverGoodsDto deliverGoodsDto) { + return adminMallOrderService.deliverGoods(deliverGoodsDto); + } + -- Gitblit v1.9.1