From 7f55c18d7db36c9cad2ac96e481680bc1107e51c Mon Sep 17 00:00:00 2001 From: Hentua <wangdoubleone@gmail.com> Date: Thu, 15 Jun 2023 11:16:11 +0800 Subject: [PATCH] Merge branch 'meiye_mall' of http://120.27.238.55:7000/r/xc-mall into meiye_mall --- src/main/java/cc/mrbird/febs/mall/dto/AddOrderDto.java | 32 ++++++++++++++++++++++++++++---- 1 files changed, 28 insertions(+), 4 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/dto/AddOrderDto.java b/src/main/java/cc/mrbird/febs/mall/dto/AddOrderDto.java index 2d78d52..a9758ca 100644 --- a/src/main/java/cc/mrbird/febs/mall/dto/AddOrderDto.java +++ b/src/main/java/cc/mrbird/febs/mall/dto/AddOrderDto.java @@ -4,6 +4,10 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotNull; +import java.math.BigDecimal; +import java.util.List; + /** * @author wzy * @date 2021-09-18 @@ -12,9 +16,29 @@ @ApiModel(value = "AddOrderDto", description = "新增订单接口参数接收类") public class AddOrderDto { - @ApiModelProperty(value = "skuID", example = "1") - private Long skuId; + @NotNull(message = "参数不能为空") + @ApiModelProperty(value = "地址ID", example = "1") + private Long addressId; - @ApiModelProperty(value = "数量", example = "2") - private Integer cnt; + @ApiModelProperty(value = "门店ID", example = "1") + private Long shopId; + + @ApiModelProperty(value = "订单提交类型", example = "1从购物车提交, 2从商品直接提交") + private Integer type; + + @ApiModelProperty(value = "备注") + private String remark; + + @ApiModelProperty(value = "1-普通订单/2-积分订单") + private Integer orderType; + + @ApiModelProperty(value = "配送方式 1:快递寄送2:到店自提") + private Integer deliverType; + + @ApiModelProperty(value = "商品明细") + private List<AddOrderItemDto> items; + + @ApiModelProperty(value = "积分数量") + private BigDecimal score; + } -- Gitblit v1.9.1