From fb6eee80334ae23a2eca8c37baeef05e86c919ed Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期二, 10 十二月 2024 17:09:00 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ShoppingCartPayment.java | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ShoppingCartPayment.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ShoppingCartPayment.java index e4e3a0a..056104b 100644 --- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ShoppingCartPayment.java +++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ShoppingCartPayment.java @@ -15,6 +15,8 @@ private String goodsJson; @ApiModelProperty(value = "支付方式（1=微信，2=账户余额，3=积分）", required = true) private Integer paymentType; + @ApiModelProperty(value = "运费支付方式（1=微信，2=账户余额）", required = true) + private Integer freightPaymentType; @ApiModelProperty(value = "核销门店id", required = true) private Integer shopId; @ApiModelProperty(value = "优惠券id", required = false) @@ -22,5 +24,7 @@ @ApiModelProperty(value = "配送方式（1=自提，2=快递）", required = false) private Integer distributionMode; @ApiModelProperty(value = "配送地址id", required = false) - private Integer userAddressId; + private Long userAddressId; + @ApiModelProperty(value = "预计提货时间", required = false) + private String expectedDeliveryTime; } -- Gitblit v1.7.1