瀏覽代碼

优惠券增加字段

skyline 2 年之前
父節點
當前提交
c0b4fbd017

+ 5 - 0
entity/src/main/java/com/kym/entity/admin/Coupon.java

@@ -59,6 +59,11 @@ public class Coupon extends BaseEntity {
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime endTime;
 
+    /**
+     * 有效期(天)
+     */
+    private Integer validity;
+
     /**
      * 券种:Discount折扣券、FullDiscount满减券
      */

+ 10 - 0
entity/src/main/java/com/kym/entity/miniapp/UserCoupon.java

@@ -65,6 +65,11 @@ public class UserCoupon extends BaseEntity {
     @JsonDeserialize(using = LocalDateTimeDeserializer.class)
     private LocalDateTime endTime;
 
+    /**
+     * 有效期(天)
+     */
+    private Integer validity;
+
     /**
      * 券种:折扣券、满减券
      */
@@ -90,6 +95,11 @@ public class UserCoupon extends BaseEntity {
      */
     private Integer status;
 
+    /**
+     * 使用状态:0-未使用,1-已使用
+     */
+    private Integer usageStatus;
+
     /**
      * 备注
      */

+ 2 - 1
mapper/src/main/resources/mappers/admin/CouponMapper.xml

@@ -10,6 +10,7 @@
         <result column="coupon_desc" property="couponDesc" />
         <result column="start_time" property="startTime" />
         <result column="end_time" property="endTime" />
+        <result column="validity" property="validity" />
         <result column="coupon_type" property="couponType" />
         <result column="min_service_money" property="minServiceMoney" />
         <result column="discount" property="discount" />
@@ -23,7 +24,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,activity_id,name, coupon_desc, start_time, end_time, coupon_type, min_service_money, discount, allow_stacke, quantity, status, remark,create_time,update_time
+        id,activity_id,name, coupon_desc, start_time, end_time, validity,coupon_type, min_service_money, discount, allow_stacke, quantity, status, remark,create_time,update_time
     </sql>
 
 </mapper>

+ 3 - 1
mapper/src/main/resources/mappers/miniapp/UserCouponMapper.xml

@@ -10,11 +10,13 @@
         <result column="user_id" property="userId" />
         <result column="start_time" property="startTime" />
         <result column="end_time" property="endTime" />
+        <result column="validity" property="validity" />
         <result column="coupon_type" property="couponType" />
         <result column="discount" property="discount" />
         <result column="min_service_money" property="minServiceMoney" />
         <result column="allow_stacke" property="allowStacke" />
         <result column="status" property="status" />
+        <result column="usage_status" property="usageStatus" />
         <result column="remark" property="remark" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -22,7 +24,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,oupon_id, activity_id, user_id, start_time, end_time, coupon_type, discount, min_service_money, allow_stacke, status, remark,create_time,update_time
+        id,oupon_id, activity_id, user_id, start_time, end_time, validity,coupon_type, discount, min_service_money, allow_stacke, status, usage_status,remark,create_time,update_time
     </sql>
 
 </mapper>