From 05e13dc68b3db44868d9e02a10ccc330366a49c6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 08 八月 2023 11:58:36 +0800
Subject: [PATCH] 修改bug

---
 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCoupon.java |  106 ++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 97 insertions(+), 9 deletions(-)

diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCoupon.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCoupon.java
index e4cee29..a379039 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCoupon.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCoupon.java
@@ -1,5 +1,6 @@
 package com.stylefeng.guns.modular.system.model;
 
+import com.baomidou.mybatisplus.annotations.TableLogic;
 import com.baomidou.mybatisplus.enums.IdType;
 
 import java.math.BigDecimal;
@@ -33,11 +34,21 @@
     /**
      * 创建时间
      */
-    private Date createtime;
+    @ApiModelProperty(value = "创建时间")
+    @TableField("create_time")
+    private Date createTime;
 
     @ApiModelProperty(value = "用户id")
     @TableField("user_id")
     private Integer userId;
+
+    @ApiModelProperty(value = "代理商id")
+    @TableField("agent_id")
+    private Integer agentId;
+
+    @ApiModelProperty(value = "分公司id")
+    @TableField("branch_office_id")
+    private Integer branchOfficeId;
 
     @ApiModelProperty(value = "优惠券名称")
     @TableField("coupon_name")
@@ -74,6 +85,71 @@
     @ApiModelProperty(value = "赠送数量 新人券")
     @TableField("coupon_send_quantity")
     private Integer couponSendQuantity;
+
+    @ApiModelProperty(value = "是否冻结 1正常 2冻结")
+    @TableField("coupon_state")
+    private Integer couponState;
+
+    @ApiModelProperty(value = "优惠券数量")
+    @TableField("coupon_count")
+    private Long couponCount;
+
+    @ApiModelProperty(value = "剩余数量")
+    @TableField("remaining_quantity")
+    private Long remainingQuantity;
+
+    @ApiModelProperty(value = "删除 true未删除 false已删除")
+    @TableField("status")
+    @TableLogic
+    private Boolean status;
+
+    public Boolean getStatus() {
+        return status;
+    }
+
+    public void setStatus(Boolean status) {
+        this.status = status;
+    }
+
+    public Long getRemainingQuantity() {
+        return remainingQuantity;
+    }
+
+    public void setRemainingQuantity(Long remainingQuantity) {
+        this.remainingQuantity = remainingQuantity;
+    }
+
+    public Long getCouponCount() {
+        return couponCount;
+    }
+
+    public void setCouponCount(Long couponCount) {
+        this.couponCount = couponCount;
+    }
+
+    public Integer getAgentId() {
+        return agentId;
+    }
+
+    public void setAgentId(Integer agentId) {
+        this.agentId = agentId;
+    }
+
+    public Integer getBranchOfficeId() {
+        return branchOfficeId;
+    }
+
+    public void setBranchOfficeId(Integer branchOfficeId) {
+        this.branchOfficeId = branchOfficeId;
+    }
+
+    public Integer getCouponState() {
+        return couponState;
+    }
+
+    public void setCouponState(Integer couponState) {
+        this.couponState = couponState;
+    }
 
     public Integer getCouponValidity() {
         return couponValidity;
@@ -155,12 +231,12 @@
         this.id = id;
     }
 
-    public Date getCreatetime() {
-        return createtime;
+    public Date getCreateTime() {
+        return createTime;
     }
 
-    public void setCreatetime(Date createtime) {
-        this.createtime = createtime;
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
     }
 
     public String getCouponName() {
@@ -179,9 +255,21 @@
     @Override
     public String toString() {
         return "TCoupon{" +
-        "id=" + id +
-        ", createtime=" + createtime +
-        ", couponName=" + couponName +
-        "}";
+                "id=" + id +
+                ", createTime=" + createTime +
+                ", userId=" + userId +
+                ", agentId=" + agentId +
+                ", branchOfficeId=" + branchOfficeId +
+                ", couponName='" + couponName + '\'' +
+                ", couponType=" + couponType +
+                ", couponCode='" + couponCode + '\'' +
+                ", couponStatus=" + couponStatus +
+                ", couponServiceType=" + couponServiceType +
+                ", couponConditionalAmount=" + couponConditionalAmount +
+                ", couponPreferentialAmount=" + couponPreferentialAmount +
+                ", couponValidity=" + couponValidity +
+                ", couponSendQuantity=" + couponSendQuantity +
+                ", couponState=" + couponState +
+                '}';
     }
 }

--
Gitblit v1.7.1