From a981c07d34edd0975b9d556d97c1f851ce79974c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 04 十二月 2024 13:40:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/MyShoppingCartVo.java |   42 ++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 42 insertions(+), 0 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 defd541..77ba777 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
@@ -15,6 +15,8 @@
 public class MyShoppingCartVo {
 	@ApiModelProperty("数据id")
 	private Long id;
+	@ApiModelProperty("商品id")
+	private Integer goodsId;
 	@ApiModelProperty("封面图")
 	private String homePicture;
 	@ApiModelProperty("商品名称")
@@ -43,4 +45,44 @@
 	 * 可获得消费积分
 	 */
 	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