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 | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 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 6d6f5c9..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; @@ -14,6 +15,7 @@ import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -21,6 +23,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; +import java.util.Map; @Slf4j @RestController @@ -58,4 +61,32 @@ return JsonResult.success(jhyOrderService.orderDetails(orderId, getUserId(request))); } + @ApiOperation("抢单") + @PostMapping(value = "/jhy/order/grab/{orderId}") + public Result<String> grabOrder(@PathVariable("orderId") Long orderId, HttpServletRequest request) { + jhyOrderService.grabOrder(orderId, getUserId(request)); + return Result.success(); + } + + @ApiOperation("取消订单") + @PostMapping(value = "/jhy/order/cancel/{orderId}") + public Result<String> cancelOrder(@PathVariable("orderId") Long orderId, HttpServletRequest request) { + jhyOrderService.cancelOrder(orderId, getUserId(request)); + return Result.success(); + } + + @ApiOperation("确认订单-支付") + @PostMapping(value = "/jhy/order/confirm") + 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