优惠卷相关

eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbMerchantCoupon.java

@@ -23,6 +23,7 @@ import javax.persistence.*;
 import javax.validation.constraints.*;
 import java.math.BigDecimal;
 import java.io.Serializable;
+import java.sql.Timestamp;
 
 /**
 * @website https://eladmin.vip
@@ -31,7 +32,6 @@ import java.io.Serializable;
 * @date 2024-03-20
 **/
 @Entity
-@Data
 @Table(name="tb_merchant_coupon")
 public class TbMerchantCoupon implements Serializable {
 
@@ -52,7 +52,7 @@ public class TbMerchantCoupon implements Serializable {
     @Column(name = "`template_id`",nullable = false)
     @NotBlank
     @ApiModelProperty(value = "templateId")
-    private String templateId;
+    private String templateId = "0";
 
     @Column(name = "`shop_id`")
     @ApiModelProperty(value = "shopId")
@@ -62,15 +62,13 @@ public class TbMerchantCoupon implements Serializable {
     @ApiModelProperty(value = "shopSnap")
     private String shopSnap;
 
-    @Column(name = "`from_time`",nullable = false)
-    @NotNull
+    @Column(name = "`from_time`")
     @ApiModelProperty(value = "开始时间")
-    private Long fromTime;
+    private Timestamp fromTime;
 
-    @Column(name = "`to_time`",nullable = false)
-    @NotNull
+    @Column(name = "`to_time`")
     @ApiModelProperty(value = "到期时间")
-    private Long toTime;
+    private Timestamp toTime;
 
     @Column(name = "`limit_number`")
     @ApiModelProperty(value = "限领数量")
@@ -81,7 +79,6 @@ public class TbMerchantCoupon implements Serializable {
     private Integer number;
 
     @Column(name = "`left_number`",nullable = false)
-    @NotNull
     @ApiModelProperty(value = "剩余数量")
     private Integer leftNumber;
 
@@ -118,11 +115,13 @@ public class TbMerchantCoupon implements Serializable {
     private String track;
 
     @Column(name = "`class_type`")
-    @ApiModelProperty(value = "品类product 商品券 ---cateogry 品类券common -通 用券")
+    @ApiModelProperty(value = "品类product 商品券 ---cateogry 品类券common -通用券")
+    @NotNull
     private String classType;
 
     @Column(name = "`effect_type`")
     @ApiModelProperty(value = "有效期类型：0-toTime有效  1-effectDays有效")
+    @NotNull
     private Integer effectType;
 
     @Column(name = "`effect_days`")
@@ -182,4 +181,276 @@ public class TbMerchantCoupon implements Serializable {
     public void copy(TbMerchantCoupon source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
     }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getTemplateId() {
+        return templateId;
+    }
+
+    public void setTemplateId(String templateId) {
+        this.templateId = templateId;
+    }
+
+    public String getShopId() {
+        return shopId;
+    }
+
+    public void setShopId(String shopId) {
+        this.shopId = shopId;
+    }
+
+    public String getShopSnap() {
+        return shopSnap;
+    }
+
+    public void setShopSnap(String shopSnap) {
+        this.shopSnap = shopSnap;
+    }
+
+    public Timestamp getFromTime() {
+        return fromTime;
+    }
+
+    public void setFromTime(Timestamp fromTime) {
+        this.fromTime = fromTime;
+    }
+
+    public Timestamp getToTime() {
+        return toTime;
+    }
+
+    public void setToTime(Timestamp toTime) {
+        this.toTime = toTime;
+    }
+
+    public Integer getLimitNumber() {
+        return limitNumber;
+    }
+
+    public void setLimitNumber(Integer limitNumber) {
+        this.limitNumber = limitNumber;
+    }
+
+    public Integer getNumber() {
+        return number;
+    }
+
+    public void setNumber(Integer number) {
+        this.number = number;
+    }
+
+    public Integer getLeftNumber() {
+        return leftNumber;
+    }
+
+    public void setLeftNumber(Integer leftNumber) {
+        this.leftNumber = leftNumber;
+    }
+
+    public BigDecimal getAmount() {
+        return amount;
+    }
+
+    public void setAmount(BigDecimal amount) {
+        this.amount = amount;
+    }
+
+    public BigDecimal getLimitAmount() {
+        return limitAmount;
+    }
+
+    public void setLimitAmount(BigDecimal limitAmount) {
+        this.limitAmount = limitAmount;
+    }
+
+    public Integer getIsShow() {
+        return isShow;
+    }
+
+    public void setIsShow(Integer isShow) {
+        this.isShow = isShow;
+    }
+
+    public String getPic() {
+        return pic;
+    }
+
+    public void setPic(String pic) {
+        this.pic = pic;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public Float getRatio() {
+        return ratio;
+    }
+
+    public void setRatio(Float ratio) {
+        this.ratio = ratio;
+    }
+
+    public BigDecimal getMaxRatioAmount() {
+        return maxRatioAmount;
+    }
+
+    public void setMaxRatioAmount(BigDecimal maxRatioAmount) {
+        this.maxRatioAmount = maxRatioAmount;
+    }
+
+    public String getTrack() {
+        return track;
+    }
+
+    public void setTrack(String track) {
+        this.track = track;
+    }
+
+    public String getClassType() {
+        return classType;
+    }
+
+    public void setClassType(String classType) {
+        this.classType = classType;
+    }
+
+    public Integer getEffectType() {
+        return effectType;
+    }
+
+    public void setEffectType(Integer effectType) {
+        this.effectType = effectType;
+    }
+
+    public Integer getEffectDays() {
+        return effectDays;
+    }
+
+    public void setEffectDays(Integer effectDays) {
+        this.effectDays = effectDays;
+    }
+
+    public String getRelationIds() {
+        return relationIds;
+    }
+
+    public void setRelationIds(String relationIds) {
+        this.relationIds = relationIds;
+    }
+
+    public String getRelationList() {
+        return relationList;
+    }
+
+    public void setRelationList(String relationList) {
+        this.relationList = relationList;
+    }
+
+    public String getEditor() {
+        return editor;
+    }
+
+    public void setEditor(String editor) {
+        this.editor = editor;
+    }
+
+    public String getNote() {
+        return note;
+    }
+
+    public void setNote(String note) {
+        this.note = note;
+    }
+
+    public Long getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Long createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public Long getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(Long updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
+    public Integer getFurnishMeal() {
+        return furnishMeal;
+    }
+
+    public void setFurnishMeal(Integer furnishMeal) {
+        this.furnishMeal = furnishMeal;
+    }
+
+    public Integer getFurnishExpress() {
+        return furnishExpress;
+    }
+
+    public void setFurnishExpress(Integer furnishExpress) {
+        this.furnishExpress = furnishExpress;
+    }
+
+    public Integer getFurnishDraw() {
+        return furnishDraw;
+    }
+
+    public void setFurnishDraw(Integer furnishDraw) {
+        this.furnishDraw = furnishDraw;
+    }
+
+    public Integer getFurnishVir() {
+        return furnishVir;
+    }
+
+    public void setFurnishVir(Integer furnishVir) {
+        this.furnishVir = furnishVir;
+    }
+
+    public Integer getDisableDistribute() {
+        return disableDistribute;
+    }
+
+    public void setDisableDistribute(Integer disableDistribute) {
+        this.disableDistribute = disableDistribute;
+    }
+
+    public String getMerchantId() {
+        return merchantId;
+    }
+
+    public void setMerchantId(String merchantId) {
+        this.merchantId = merchantId;
+    }
 }

eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopInfo.java

@@ -217,6 +217,10 @@ public class TbShopInfo implements Serializable {
     @Column(name = "profiles")
     @ApiModelProperty(value = "未激活 no 试用probation 正式release")
     private String profiles="";
+//    @Column(name = "is_open_yhq")
+//    @ApiModelProperty(value = "是否参与优惠券活动 0否 1是")
+    @Transient
+    private String isOpenYhq;
 
     public void copy(TbShopInfo source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(false));