From 1f2deeadddd52a23271c8df479912051c44f8f2d Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Mon, 28 Jun 2021 21:11:12 +0800 Subject: [PATCH] modify --- gc-order/src/main/java/com/xzx/gc/order/controller/ApiJhyOrderController.java | 5 +++-- gc-order/src/main/java/com/xzx/gc/order/dto/JhyOrderConfirmDto.java | 6 ++++++ gc-order/src/main/java/com/xzx/gc/order/dto/JhyOrderConfirmItemsDto.java | 21 +++++++++++++++++++++ 3 files changed, 30 insertions(+), 2 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..ac46420 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; @@ -68,14 +69,14 @@ @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; } @ApiOperation("确认订单-支付") @PostMapping(value = "/jhy/order/confirm") - public Result<String> confirmOrder() { + public Result<String> confirmOrder(@RequestBody JhyOrderConfirmDto confirmDto) { return null; } diff --git a/gc-order/src/main/java/com/xzx/gc/order/dto/JhyOrderConfirmDto.java b/gc-order/src/main/java/com/xzx/gc/order/dto/JhyOrderConfirmDto.java index 6d56a6f..c45f07a 100644 --- a/gc-order/src/main/java/com/xzx/gc/order/dto/JhyOrderConfirmDto.java +++ b/gc-order/src/main/java/com/xzx/gc/order/dto/JhyOrderConfirmDto.java @@ -1,7 +1,10 @@ package com.xzx.gc.order.dto; import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; + +import java.util.List; /** * @author wzy @@ -11,6 +14,9 @@ @ApiModel(value = "JhyOrderConfirmDto") public class JhyOrderConfirmDto { + @ApiModelProperty(value = "订单ID") private Long orderId; + @ApiModelProperty(value = "明细") + private List<JhyOrderConfirmItemsDto> items; } diff --git a/gc-order/src/main/java/com/xzx/gc/order/dto/JhyOrderConfirmItemsDto.java b/gc-order/src/main/java/com/xzx/gc/order/dto/JhyOrderConfirmItemsDto.java new file mode 100644 index 0000000..aa46f47 --- /dev/null +++ b/gc-order/src/main/java/com/xzx/gc/order/dto/JhyOrderConfirmItemsDto.java @@ -0,0 +1,21 @@ +package com.xzx.gc.order.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author wzy + * @date 2021-06-28 + **/ +@Data +@ApiModel(value = "JhyOrderConfirmItemsDto") +public class JhyOrderConfirmItemsDto { + + @ApiModelProperty(value = "id") + private Long id; + + @ApiModelProperty(value = "重量") + private String weight; + +} -- Gitblit v1.9.1