会员商品 添加购物车 记录

src/main/java/com/chaozhanggui/system/cashierservice/entity/TbActivate.java

@@ -1,7 +1,11 @@
 package com.chaozhanggui.system.cashierservice.entity;
 
+import org.springframework.util.CollectionUtils;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
 
 public class TbActivate implements Serializable {
     private Integer id;
@@ -20,6 +24,7 @@ public class TbActivate implements Serializable {
 
     //是否赠送商品 0否 1是
     private Integer isGiftPro;
+    private List<String> gives;
 
     private static final long serialVersionUID = 1L;
 
@@ -86,4 +91,16 @@ public class TbActivate implements Serializable {
     public void setIsGiftPro(Integer isGiftPro) {
         this.isGiftPro = isGiftPro;
     }
+
+    public List<String> getGives() {
+        return gives;
+    }
+
+    public void setGives(List<String> gives) {
+        if(CollectionUtils.isEmpty(gives)){
+            this.gives = new ArrayList<>();
+        }else {
+            this.gives = gives;
+        }
+    }
 }

src/main/java/com/chaozhanggui/system/cashierservice/entity/TbActivateInRecord.java

@@ -4,13 +4,13 @@ import java.util.Date;
 import java.io.Serializable;
 
 /**
- * 活动商品赠送表(TbActivateGiveRecord)实体类
+ * 活动商品赠送表(TbActivateInRecord)实体类
  *
  * @author ww
- * @since 2024-08-20 15:20:43
+ * @since 2024-08-22 11:13:40
  */
-public class TbActivateGiveRecord implements Serializable {
-    private static final long serialVersionUID = -53463432636369401L;
+public class TbActivateInRecord implements Serializable {
+    private static final long serialVersionUID = -35515830201618782L;
 
     private Integer id;
     /**
@@ -25,30 +25,37 @@ public class TbActivateGiveRecord implements Serializable {
      * 赠送数量
      */
     private Integer num;
+    /**
+     * 未使用数量
+     */
+    private Integer overNum;
     /**
      * 店铺id
      */
     private Integer shopId;
-    private Integer sourceFlowId;
     /**
      * 来源活动id
      */
     private Integer sourceActId;
 
+    private Integer sourceFlowId;
+
     private Date createTime;
 
     private Date updateTime;
 
-    public TbActivateGiveRecord(Integer vipUserId, Integer proId, Integer num, Integer shopId, Integer sourceActId,Integer sourceFlowId) {
+    public TbActivateInRecord(Integer vipUserId, Integer proId, Integer num, Integer shopId, Integer sourceActId,Integer sourceFlowId) {
         this.vipUserId = vipUserId;
         this.proId = proId;
         this.num = num;
+        this.overNum = num;
         this.shopId = shopId;
         this.sourceActId = sourceActId;
         this.sourceFlowId = sourceFlowId;
         this.createTime=new Date();
     }
 
+
     public Integer getId() {
         return id;
     }
@@ -81,6 +88,14 @@ public class TbActivateGiveRecord implements Serializable {
         this.num = num;
     }
 
+    public Integer getOverNum() {
+        return overNum;
+    }
+
+    public void setOverNum(Integer overNum) {
+        this.overNum = overNum;
+    }
+
     public Integer getShopId() {
         return shopId;
     }
@@ -89,6 +104,13 @@ public class TbActivateGiveRecord implements Serializable {
         this.shopId = shopId;
     }
 
+    public Integer getSourceActId() {
+        return sourceActId;
+    }
+
+    public void setSourceActId(Integer sourceActId) {
+        this.sourceActId = sourceActId;
+    }
 
     public Integer getSourceFlowId() {
         return sourceFlowId;
@@ -98,14 +120,6 @@ public class TbActivateGiveRecord implements Serializable {
         this.sourceFlowId = sourceFlowId;
     }
 
-    public Integer getSourceActId() {
-        return sourceActId;
-    }
-
-    public void setSourceActId(Integer sourceActId) {
-        this.sourceActId = sourceActId;
-    }
-
     public Date getCreateTime() {
         return createTime;
     }

src/main/java/com/chaozhanggui/system/cashierservice/entity/TbActivateOutRecord.java

@@ -0,0 +1,125 @@
+package com.chaozhanggui.system.cashierservice.entity;
+
+import java.util.Date;
+import java.io.Serializable;
+
+/**
+ * 活动赠送商品使用记录表(TbActivateOutRecord)实体类
+ *
+ * @author ww
+ * @since 2024-08-22 11:21:56
+ */
+public class TbActivateOutRecord implements Serializable {
+    private static final long serialVersionUID = -54399746948905097L;
+
+    private Integer id;
+    /**
+     * 商品赠送Id
+     */
+    private Integer giveId;
+    /**
+     * 商品id
+     */
+    private Integer proId;
+    /**
+     * 使用数量
+     */
+    private Integer useNum;
+    /**
+     * 退单量
+     */
+    private Integer refNum;
+    /**
+     * 订单id
+     */
+    private String orderId;
+    //新建： create， 完成： closed, 取消：cancel,
+    private String status;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    public TbActivateOutRecord(Integer giveId, Integer proId, Integer useNum, String orderId, String status) {
+        this.giveId = giveId;
+        this.proId = proId;
+        this.useNum = useNum;
+        this.orderId = orderId;
+        this.status = status;
+        this.createTime = new Date();
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getGiveId() {
+        return giveId;
+    }
+
+    public void setGiveId(Integer giveId) {
+        this.giveId = giveId;
+    }
+
+    public Integer getProId() {
+        return proId;
+    }
+
+    public void setProId(Integer proId) {
+        this.proId = proId;
+    }
+
+    public Integer getUseNum() {
+        return useNum;
+    }
+
+    public void setUseNum(Integer useNum) {
+        this.useNum = useNum;
+    }
+
+    public Integer getRefNum() {
+        return refNum;
+    }
+
+    public void setRefNum(Integer refNum) {
+        this.refNum = refNum;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(String orderId) {
+        this.orderId = orderId;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+}
+

src/main/java/com/chaozhanggui/system/cashierservice/entity/TbCashierCart.java

@@ -58,6 +58,7 @@ public class TbCashierCart implements Serializable {
     private Long updatedAt;
     private Integer userId;
     private String tableId;
+    private Byte isVip;
     private TbProductSpec tbProductSpec;
 
     private static final long serialVersionUID = 1L;

src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderDetail.java

@@ -20,6 +20,8 @@ public class TbOrderDetail implements Serializable {
 
     private Integer num;
 
+    private Byte isVip;
+
     private String productName;
     private String status;
 

src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/VipProductsLimits.java

@@ -0,0 +1,11 @@
+package com.chaozhanggui.system.cashierservice.entity.vo;
+
+import com.chaozhanggui.system.cashierservice.entity.TbProduct;
+import lombok.Data;
+
+@Data
+public class VipProductsLimits extends TbProduct {
+
+    private Integer vipLimitNumber;
+
+}