From f88cfa02e36752e4acad7adc4b045155e8e50f21 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 08 十二月 2023 09:16:29 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

---
 cloud-server-activity/src/main/java/com/dsh/activity/entity/PointsMerchandise.java |   55 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/entity/PointsMerchandise.java b/cloud-server-activity/src/main/java/com/dsh/activity/entity/PointsMerchandise.java
index 1eb90d6..6b30671 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/entity/PointsMerchandise.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/entity/PointsMerchandise.java
@@ -1,9 +1,11 @@
 package com.dsh.activity.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -34,98 +36,145 @@
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
     /**
-     * 类型（1=实体商品，2=课包商品，3=门票商品）
+     * 类型（1=实体商品，2=课包商品，3=门票商品 4=优惠券）
      */
+    @TableField("type")
     private Integer type;
     /**
      * 商品名称
      */
+    @TableField("name")
     private String name;
     /**
      * 课包id
      */
+    @TableField("coursePackageId")
     private Integer coursePackageId;
     /**
      * 原价
      */
+    @TableField("price")
     private BigDecimal price;
     /**
      * 兑换方式（1=积分，2=现金+积分）
      */
+    @TableField("redemptionMethod")
     private Integer redemptionMethod;
     /**
      * 所需现金
      */
+    @TableField("cash")
     private BigDecimal cash;
     /**
      * 所属积分
      */
-    private BigDecimal integral;
+    @TableField("integral")
+    private Integer integral;
     /**
      * 商品封面
      */
+    @TableField("cover")
     private String cover;
     /**
      * 商品图片
      */
+    @TableField("productImages")
     private String productImages;
     /**
      * 用户人群（1=全部用户，2=年度会员，3=已有学员用户）
      */
+    @TableField("userPopulation")
     private Integer userPopulation;
     /**
      * 发放数量
      */
+    @TableField("quantityIssued")
     private Integer quantityIssued;
     /**
      * 限领数量
      */
+    @TableField("pickUpQuantity")
     private Integer pickUpQuantity;
     /**
      * 开始时间
      */
+    @TableField("startTime")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date startTime;
     /**
      * 结束时间
      */
+    @TableField("endTime")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date endTime;
     /**
      * 使用范围（1=全国，2=指定城市，3=指定门店）
      */
+    @TableField("useScope")
     private Integer useScope;
     /**
      * 省
      */
+    @TableField("province")
     private String province;
     /**
      * 省编号
      */
+    @TableField("provinceCode")
     private String provinceCode;
     /**
      * 市
      */
+    @TableField("city")
     private String city;
     /**
      * 市编号
      */
+    @TableField("cityCode")
     private String cityCode;
     /**
      * 兑换说明
      */
+    @TableField("redemptionInstructions")
     private String redemptionInstructions;
     /**
      * 排序
      */
+    @TableField("sort")
     private Integer sort;
     /**
      * 状态（1=正常，2=冻结，3=删除）
      */
+    @TableField("state")
     private Integer state;
     /**
      * 添加时间
      */
+    @TableField("insertTime")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date insertTime;
-
+    /**
+     * 课包支付配置id
+     */
+    @TableField("coursePackageConfigId")
+    private Integer coursePackageConfigId;
+    /**
+     * 1=上架 2=下架
+     */
+    @TableField("shelves")
+    private Integer shelves;
+    @TableField("cardType")
+    private Integer cardType;
+    @TableField("status")
+    private Integer status;
+    @TableField("remark")
+    private String remark;
+    // 已领数量
+    @TableField(exist = false)
+    private Integer pickUpQuantity3;
+    // 已兑换数量
+    @TableField(exist = false)
+    private Integer pickUpQuantity4;
 
     @Override
     protected Serializable pkVal() {

--
Gitblit v1.7.1