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/ConfirmOrder.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ConfirmOrder.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ConfirmOrder.java
index 7382984..4983fe5 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ConfirmOrder.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ConfirmOrder.java
@@ -11,10 +11,14 @@
@Data
@ApiModel
public class ConfirmOrder {
- @ApiModelProperty(value = "购物商品id JSON", required = true)
+ @ApiModelProperty(value = "购买方式（1=购物车，2=商品详情）", required = true)
+ private Integer position;
+ @ApiModelProperty(value = "购物车数据id,数量 JSON[{id:1212,num:2}]", required = true)
private String goodsJson;
@ApiModelProperty(value = "支付方式（1=现金，2=积分）", required = true)
private Integer paymentType;
@ApiModelProperty(value = "核销门店id", required = true)
private Integer shopId;
+ @ApiModelProperty(value = "商品类型（1=服务商品，2=单品商品）", required = true)
+ private Integer type;
}
--
Gitblit v1.7.1