From 609d91e1e62b1e8932b34b15b09baf02e7f09a93 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 09 十二月 2024 10:36:47 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ShoppingCartPayment.java | 10 +++++++---
1 files changed, 7 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 268ac4c..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
@@ -13,14 +13,18 @@
public class ShoppingCartPayment {
@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;
+ private Long userAddressId;
+ @ApiModelProperty(value = "预计提货时间", required = false)
+ private String expectedDeliveryTime;
}
--
Gitblit v1.7.1