From 6f54cebf07887237f5eb8efdf9d1d0b784dbaa49 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 10 十二月 2024 10:05:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/MyShoppingCartVo.java | 66 +++++++++++++++++++++++++++++++--
1 files changed, 62 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/MyShoppingCartVo.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/MyShoppingCartVo.java
index 4e3fd25..cc3b4b5 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/MyShoppingCartVo.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/MyShoppingCartVo.java
@@ -4,21 +4,27 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.math.BigDecimal;
+
/**
* @author zhibing.pu
* @Date 2024/11/25 11:51
*/
@Data
-@ApiModel
+@ApiModel("购物车")
public class MyShoppingCartVo {
+ @ApiModelProperty("数据id")
+ private String id;
@ApiModelProperty("商品id")
- private Integer id;
+ private Integer goodsId;
@ApiModelProperty("封面图")
private String homePicture;
@ApiModelProperty("商品名称")
private String name;
- @ApiModelProperty("售价")
- private String sellingPrice;
+ @ApiModelProperty("售价现金")
+ private BigDecimal cash;
+ @ApiModelProperty("售价积分")
+ private Integer point;
@ApiModelProperty("原价")
private String originalPrice;
@ApiModelProperty("购买数量")
@@ -27,4 +33,56 @@
private Long endTime;
@ApiModelProperty("是否可核销（0=否，1=是）")
private Boolean verifiable;
+ @ApiModelProperty("是否超出限购数量")
+ private Boolean purchaseLimit;
+ @ApiModelProperty("现金支付")
+ private Boolean cashPayment;
+ @ApiModelProperty("积分支付")
+ private Boolean pointPayment;
+ @ApiModelProperty("配送方式（1=自提，2=快递）")
+ private Integer distributionMode;
+ /**
+ * 可获得消费积分
+ */
+ private Integer earnSpendingPoints;
+ /**
+ * 上级获得分佣金额
+ */
+ private BigDecimal superiorSubcommission;
+ /**
+ * 上级获得返佣积分
+ */
+ private Integer superiorRebatePoints;
+ /**
+ * 获取返佣积分上级类型（1=直推上级，2=直帮上级）
+ */
+ private Integer superiorType;
+ /**
+ * 核销门店可获得服务费
+ */
+ private BigDecimal servuceShopCharges;
+ /**
+ * 核销门店可获得服务积分
+ */
+ private Integer servuceShopPoints;
+ /**
+ * 技师可获得服务积分
+ */
+ private Integer technicianPoints;
+ /**
+ * 绑定门店可获得分佣金额
+ */
+ private BigDecimal boundShopCharges;
+ /**
+ * 绑定门店可获得返佣积分
+ */
+ private Integer boundShopPoints;
+ /**
+ * 绑定门店上级门店可获得分佣金额
+ */
+ private BigDecimal boundShopSuperiorsCharges;
+ /**
+ * 绑定门店上级门店可获得返佣积分
+ */
+ private Integer boundShopSuperiorsPoints;
}
--
Gitblit v1.7.1