From 56968f6f02f691397eac17d8fb8f8b34f440ab90 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Tue, 20 Jul 2021 17:45:09 +0800 Subject: [PATCH] add orderStatusCnt --- gc-order/src/main/java/com/xzx/gc/order/controller/ApiJhyOrderController.java | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/gc-order/src/main/java/com/xzx/gc/order/controller/ApiJhyOrderController.java b/gc-order/src/main/java/com/xzx/gc/order/controller/ApiJhyOrderController.java index 8080976..e45e802 100644 --- a/gc-order/src/main/java/com/xzx/gc/order/controller/ApiJhyOrderController.java +++ b/gc-order/src/main/java/com/xzx/gc/order/controller/ApiJhyOrderController.java @@ -5,6 +5,7 @@ import com.xzx.gc.common.request.BaseController; import com.xzx.gc.model.JsonResult; import com.xzx.gc.order.dto.AddJhyOrderDto; +import com.xzx.gc.order.dto.JhyOrderConfirmDto; import com.xzx.gc.order.dto.JhyOrderListDto; import com.xzx.gc.order.service.JhyOrderService; import com.xzx.gc.order.vo.JhyOrderDetailsVo; @@ -22,6 +23,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; +import java.util.Map; @Slf4j @RestController @@ -68,15 +70,23 @@ @ApiOperation("取消订单") @PostMapping(value = "/jhy/order/cancel/{orderId}") - public Result<String> cancelOrder(Long orderId, HttpServletRequest request) { + public Result<String> cancelOrder(@PathVariable("orderId") Long orderId, HttpServletRequest request) { jhyOrderService.cancelOrder(orderId, getUserId(request)); - return null; + return Result.success(); } @ApiOperation("确认订单-支付") @PostMapping(value = "/jhy/order/confirm") - public Result<String> confirmOrder() { - return null; + public Result<String> confirmOrder(@RequestBody JhyOrderConfirmDto confirmDto, HttpServletRequest request) { + confirmDto.setUserId(getUserId(request)); + jhyOrderService.confirmOrder(confirmDto); + return Result.success(); + } + + @ApiOperation("订单状态数量") + @PostMapping(value = "/orderStatusCnt") + public JsonResult<Map<Integer, Integer>> orderStatusCnt(HttpServletRequest request) { + return JsonResult.success(jhyOrderService.orderStatusCount(getUserId(request))); } } -- Gitblit v1.9.1