From e46e620ea7afd8b18aa24dde8e3c9564355fa14f Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期日, 28 九月 2025 15:14:51 +0800
Subject: [PATCH] Merge branch 'send_coupon' into user_action

---
 framework/src/main/java/cn/lili/modules/lmk/domain/vo/StoreCouponClaimRecordVO.java |   77 +++++++++++++++++++++++++++++++++++---
 1 files changed, 71 insertions(+), 6 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/vo/StoreCouponClaimRecordVO.java b/framework/src/main/java/cn/lili/modules/lmk/domain/vo/StoreCouponClaimRecordVO.java
index 0e77ba3..c50d499 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/vo/StoreCouponClaimRecordVO.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/vo/StoreCouponClaimRecordVO.java
@@ -2,12 +2,15 @@
 
 import cn.lili.base.AbsVo;
 import cn.lili.modules.lmk.domain.entity.StoreCouponClaimRecord;
-import java.util.List;
-import org.springframework.lang.NonNull;
-import org.springframework.beans.BeanUtils;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.lang.NonNull;
+import org.springframework.beans.BeanUtils;
+
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -34,11 +37,73 @@
 
     /** 搴楅摵id */
     @ApiModelProperty("搴楅摵id")
-    private Long storeId;
+    private String storeId;
 
     /** 鐢ㄦ埛id */
     @ApiModelProperty("鐢ㄦ埛id")
-    private Long userId;
+    private String userId;
+
+
+    @ApiModelProperty("搴楅摵浼樻儬鍒稿叧鑱擨D")
+    private String storeCouponId;
+
+    @ApiModelProperty("鍒涘缓鑰�")
+    private String createBy;
+
+    @ApiModelProperty("鍒涘缓鏃堕棿")
+    private Date createTime;
+
+    @ApiModelProperty("淇敼鑰�")
+    private String updateBy;
+
+    @ApiModelProperty("鏇存柊鏃堕棿")
+    private Date updateTime;
+
+    @ApiModelProperty("鍒犻櫎鏍囧織")
+    private Boolean deleteFlag;
+
+    // 琛ュ厖浼氬憳浼樻儬鍒歌〃鍏宠仈瀛楁
+    @ApiModelProperty("浼氬憳ID")
+    private String memberId;
+
+    @ApiModelProperty("浼氬憳鍚嶇О")
+    private String memberName;
+
+    @ApiModelProperty("浼樻儬鍒搁潰棰�")
+    private BigDecimal price;
+
+    @ApiModelProperty("浣跨敤璧峰鏃堕棿")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date startTime;
+
+    @ApiModelProperty("浣跨敤鎴鏃堕棿")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endTime;
+
+    @ApiModelProperty("浼氬憳浼樻儬鍒哥姸鎬�")
+    private String memberCouponStatus;
+
+    @ApiModelProperty("鍟嗗搧浣跨敤闄愬埗娆℃暟")
+    private Integer goodsUseLimitNum;
+
+    @ApiModelProperty("鏄惁鏄钩鍙颁紭鎯犲埜")
+    private Boolean platformFlag;
+
+    @ApiModelProperty("浼樻儬鍒哥被鍨�")
+    private String getType;
+
+    @ApiModelProperty("鎶樻墸")
+    private BigDecimal discount;
+
+    @ApiModelProperty("娲诲姩绫诲瀷")
+    private String couponType;
+
+    @ApiModelProperty("棰嗗彇鏃堕棿")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date claimTime;
 
     public static StoreCouponClaimRecordVO getVoByEntity(@NonNull StoreCouponClaimRecord entity, StoreCouponClaimRecordVO vo) {
         if(vo == null) {
@@ -48,4 +113,4 @@
         return vo;
     }
 
-}
+}
\ No newline at end of file

--
Gitblit v1.8.0