From 457b40e054a68d0dc5b5fc755cdf468e5d37ab28 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 06 十二月 2024 10:19:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ShoppingCartPayment.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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 02db9f0..fee0f50 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
@@ -11,12 +11,20 @@
@Data
@ApiModel
public class ShoppingCartPayment {
- @ApiModelProperty(value = "购物商品id JSON", required = true)
+ @ApiModelProperty(value = "购物车数据id,数量 JSON[{id:1212,num:2}]", required = true)
private String goodsJson;
- @ApiModelProperty(value = "支付方式（1=现金，2=积分）", required = true)
+ @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)
- private String userCouponId;
+ private Long userCouponId;
+ @ApiModelProperty(value = "配送方式（1=自提，2=快递）", required = false)
+ private Integer distributionMode;
+ @ApiModelProperty(value = "配送地址id", required = false)
+ private Integer userAddressId;
+ @ApiModelProperty(value = "预计提货时间", required = false)
+ private String expectedDeliveryTime;
}
--
Gitblit v1.7.1