From 5e77d6fbb049b2407a15387d73e2755d901a235e Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期五, 26 九月 2025 16:28:27 +0800
Subject: [PATCH] 字段调整

---
 framework/src/main/java/cn/lili/modules/lmk/domain/entity/StoreCoupon.java             |   11 +
 framework/src/main/java/cn/lili/modules/lmk/domain/form/StoreCouponForm.java           |    9 +
 framework/src/main/java/cn/lili/modules/lmk/enums/general/GenerateCouponStausEnum.java |   13 ++
 framework/src/main/java/cn/lili/modules/lmk/domain/entity/StoreCouponSingle.java       |   64 ++++++++++++
 framework/src/main/java/cn/lili/modules/lmk/enums/general/StoreCouponStausEnum.java    |   14 ++
 framework/src/main/java/cn/lili/modules/lmk/domain/query/StoreCouponSingleQuery.java   |   22 ++++
 framework/src/main/java/cn/lili/modules/lmk/domain/vo/StoreCouponSingleVO.java         |   55 +++++++++++
 framework/src/main/java/cn/lili/modules/lmk/domain/form/StoreCouponSingleForm.java     |   58 +++++++++++
 8 files changed, 243 insertions(+), 3 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/entity/StoreCoupon.java b/framework/src/main/java/cn/lili/modules/lmk/domain/entity/StoreCoupon.java
index c25e286..03b8b0d 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/entity/StoreCoupon.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/entity/StoreCoupon.java
@@ -1,5 +1,6 @@
 package cn.lili.modules.lmk.domain.entity;
 
+import cn.lili.modules.lmk.enums.general.GenerateCouponStausEnum;
 import cn.lili.modules.lmk.enums.general.StoreCouponStausEnum;
 import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -36,11 +37,11 @@
 
     @TableField("coupon_claim_num")
     /** 浼樻儬鍗烽鍙栨暟閲� */
-    private String couponClaimNum;
+    private Integer couponClaimNum;
 
     @TableField("coupon_num")
     /** 浼樻儬鍗风敓鎴愭暟閲� */
-    private String couponNum;
+    private Integer couponNum;
 
     @TableField("status")
     /** 搴楅摵浼樻儬鍗风姸鎬�
@@ -48,5 +49,11 @@
      * */
     private String status;
 
+    @TableField("generate_status")
+    /** 鐢熸垚浼樻儬鍗风姸鎬�
+     * @see GenerateCouponStausEnum
+     * */
+    private String generateStatus;
+
 
 }
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/entity/StoreCouponSingle.java b/framework/src/main/java/cn/lili/modules/lmk/domain/entity/StoreCouponSingle.java
new file mode 100644
index 0000000..1e9673c
--- /dev/null
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/entity/StoreCouponSingle.java
@@ -0,0 +1,64 @@
+package cn.lili.modules.lmk.domain.entity;
+
+import cn.lili.modules.order.order.entity.enums.ClaimStatusEnum;
+import cn.lili.mybatis.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import lombok.Data;
+
+/**
+ * 搴楅摵浼樻儬鍗峰崟鍝�
+ *
+ * @author peng
+ * @since 2025-09-26
+ */
+@Data
+@TableName("lmk_store_coupon_single")
+public class StoreCouponSingle extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableField("store_coup_ref")
+    /** 搴楅摵浼樻儬鍗峰叧鑱攊d */
+    private String storeCoupRef;
+
+    @TableField("store_id")
+    /** 鍟嗗id */
+    private Long storeId;
+
+
+    @TableField("store_name")
+    /** 鍟嗗id */
+    private String storeName;
+
+    @TableField("coupon_id")
+    /** 浼樻儬鍗穒d */
+    private String couponId;
+
+    @TableField("coupon_name")
+    /** 浼樻儬鍗峰悕绉� */
+    private String couponName;
+
+    @TableField("coupon_no")
+    /** 缂栧彿 */
+    private String couponNo;
+
+    @TableField("claim_status")
+    /** 鏄惁棰嗗彇
+     * @see ClaimStatusEnum
+     * */
+    private String claimStatus;
+
+    @TableField("claim_user_id")
+    /** 棰嗗彇鐢ㄦ埛id
+     * */
+    private String claimUserId;
+
+    @TableField("claim_user_name")
+    /** 棰嗗彇鐢ㄦ埛鍚嶇О
+     * */
+    private String claimUserName;
+
+
+}
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/form/StoreCouponForm.java b/framework/src/main/java/cn/lili/modules/lmk/domain/form/StoreCouponForm.java
index 1830e31..811df29 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/form/StoreCouponForm.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/form/StoreCouponForm.java
@@ -4,6 +4,7 @@
 import cn.lili.group.Add;
 import cn.lili.base.AbsForm;
 import cn.lili.modules.lmk.domain.entity.StoreCoupon;
+import com.baomidou.mybatisplus.annotation.TableField;
 import org.springframework.beans.BeanUtils;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
@@ -33,12 +34,18 @@
 
     @NotNull(message = "浼樻儬鍗穒d涓嶈兘涓虹┖", groups = {Add.class, Update.class})
     @ApiModelProperty("浼樻儬鍗穒d")
-    private Long couponId;
+    private String couponId;
 
     @NotBlank(message = "浼樻儬鍗峰悕绉颁笉鑳戒负绌�", groups = {Add.class, Update.class})
     @ApiModelProperty("浼樻儬鍗峰悕绉�")
     private String couponName;
 
+    @NotBlank(message = "鐢熸垚浼樻儬鍗锋暟閲忎笉鑳戒负绌�", groups = {Add.class, Update.class})
+    @ApiModelProperty("鐢熸垚浼樻儬鍗锋暟閲�")
+    private Integer couponNum;
+
+
+
     public static StoreCoupon getEntityByForm(@NonNull StoreCouponForm form, StoreCoupon entity) {
         if(entity == null) {
           entity = new StoreCoupon();
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/form/StoreCouponSingleForm.java b/framework/src/main/java/cn/lili/modules/lmk/domain/form/StoreCouponSingleForm.java
new file mode 100644
index 0000000..6ae580f
--- /dev/null
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/form/StoreCouponSingleForm.java
@@ -0,0 +1,58 @@
+package cn.lili.modules.lmk.domain.form;
+
+import cn.lili.group.Update;
+import cn.lili.group.Add;
+import cn.lili.base.AbsForm;
+import cn.lili.modules.lmk.domain.entity.StoreCouponSingle;
+import org.springframework.beans.BeanUtils;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import org.springframework.lang.NonNull;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+/**
+ * 搴楅摵浼樻儬鍗峰崟鍝佽〃鍗�
+ *
+ * @author peng
+ * @since 2025-09-26
+ */
+@Data
+@ApiModel(value = "StoreCouponSingle琛ㄥ崟", description = "搴楅摵浼樻儬鍗峰崟鍝佽〃鍗�")
+public class StoreCouponSingleForm extends AbsForm {
+
+    @NotNull(message = "搴楅摵浼樻儬鍗峰叧鑱攊d涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+    @ApiModelProperty("搴楅摵浼樻儬鍗峰叧鑱攊d")
+    private Long storeCoupRef;
+
+    @NotNull(message = "鍟嗗id涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+    @ApiModelProperty("鍟嗗id")
+    private Long storeId;
+
+    @NotNull(message = "浼樻儬鍗穒d涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+    @ApiModelProperty("浼樻儬鍗穒d")
+    private Long couponId;
+
+    @NotBlank(message = "浼樻儬鍗峰悕绉颁笉鑳戒负绌�", groups = {Add.class, Update.class})
+    @ApiModelProperty("浼樻儬鍗峰悕绉�")
+    private String couponName;
+
+    @NotBlank(message = "缂栧彿涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+    @ApiModelProperty("缂栧彿")
+    private String couponNo;
+
+    @NotBlank(message = "鏄惁棰嗗彇涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+    @ApiModelProperty("鏄惁棰嗗彇")
+    private String claimStatus;
+
+    public static StoreCouponSingle getEntityByForm(@NonNull StoreCouponSingleForm form, StoreCouponSingle entity) {
+        if(entity == null) {
+          entity = new StoreCouponSingle();
+        }
+        BeanUtils.copyProperties(form, entity);
+        return entity;
+    }
+
+}
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/query/StoreCouponSingleQuery.java b/framework/src/main/java/cn/lili/modules/lmk/domain/query/StoreCouponSingleQuery.java
new file mode 100644
index 0000000..7dc3b3f
--- /dev/null
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/query/StoreCouponSingleQuery.java
@@ -0,0 +1,22 @@
+package cn.lili.modules.lmk.domain.query;
+
+import cn.lili.base.AbsQuery;
+import java.util.List;
+import org.springframework.lang.NonNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 搴楅摵浼樻儬鍗峰崟鍝佹煡璇�
+ *
+ * @author peng
+ * @since 2025-09-26
+ */
+@Data
+@ApiModel(value = "StoreCouponSingle鏌ヨ鍙傛暟", description = "搴楅摵浼樻儬鍗峰崟鍝佹煡璇㈠弬鏁�")
+public class StoreCouponSingleQuery extends AbsQuery {
+}
+
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/vo/StoreCouponSingleVO.java b/framework/src/main/java/cn/lili/modules/lmk/domain/vo/StoreCouponSingleVO.java
new file mode 100644
index 0000000..1275bc1
--- /dev/null
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/vo/StoreCouponSingleVO.java
@@ -0,0 +1,55 @@
+package cn.lili.modules.lmk.domain.vo;
+
+import cn.lili.base.AbsVo;
+import cn.lili.modules.lmk.domain.entity.StoreCouponSingle;
+import java.util.List;
+import org.springframework.lang.NonNull;
+import org.springframework.beans.BeanUtils;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+/**
+ * 搴楅摵浼樻儬鍗峰崟鍝佸睍绀�
+ *
+ * @author peng
+ * @since 2025-09-26
+ */
+@Data
+@ApiModel(value = "搴楅摵浼樻儬鍗峰崟鍝佸搷搴旀暟鎹�", description = "搴楅摵浼樻儬鍗峰崟鍝佸搷搴旀暟鎹�")
+public class StoreCouponSingleVO extends AbsVo {
+
+    /** 搴楅摵浼樻儬鍗峰叧鑱攊d */
+    @ApiModelProperty("搴楅摵浼樻儬鍗峰叧鑱攊d")
+    private Long storeCoupRef;
+
+    /** 鍟嗗id */
+    @ApiModelProperty("鍟嗗id")
+    private Long storeId;
+
+    /** 浼樻儬鍗穒d */
+    @ApiModelProperty("浼樻儬鍗穒d")
+    private Long couponId;
+
+    /** 浼樻儬鍗峰悕绉� */
+    @ApiModelProperty("浼樻儬鍗峰悕绉�")
+    private String couponName;
+
+    /** 缂栧彿 */
+    @ApiModelProperty("缂栧彿")
+    private String couponNo;
+
+    /** 鏄惁棰嗗彇 */
+    @ApiModelProperty("鏄惁棰嗗彇")
+    private String claimStatus;
+
+    public static StoreCouponSingleVO getVoByEntity(@NonNull StoreCouponSingle entity, StoreCouponSingleVO vo) {
+        if(vo == null) {
+            vo = new StoreCouponSingleVO();
+        }
+        BeanUtils.copyProperties(entity, vo);
+        return vo;
+    }
+
+}
diff --git a/framework/src/main/java/cn/lili/modules/lmk/enums/general/GenerateCouponStausEnum.java b/framework/src/main/java/cn/lili/modules/lmk/enums/general/GenerateCouponStausEnum.java
new file mode 100644
index 0000000..5eda2b4
--- /dev/null
+++ b/framework/src/main/java/cn/lili/modules/lmk/enums/general/GenerateCouponStausEnum.java
@@ -0,0 +1,13 @@
+package cn.lili.modules.lmk.enums.general;
+
+import lombok.AllArgsConstructor;
+
+@AllArgsConstructor
+public enum GenerateCouponStausEnum {
+    NOT_GENERATE("娌℃湁鐢熸垚"),
+    GENERATE("鐢熸垚");
+
+    private String des;
+
+
+}
diff --git a/framework/src/main/java/cn/lili/modules/lmk/enums/general/StoreCouponStausEnum.java b/framework/src/main/java/cn/lili/modules/lmk/enums/general/StoreCouponStausEnum.java
new file mode 100644
index 0000000..287ed75
--- /dev/null
+++ b/framework/src/main/java/cn/lili/modules/lmk/enums/general/StoreCouponStausEnum.java
@@ -0,0 +1,14 @@
+package cn.lili.modules.lmk.enums.general;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@AllArgsConstructor
+public enum StoreCouponStausEnum {
+    ENABLE("鍚敤"),
+    DISABLE("绂佺敤");
+
+    private String des;
+
+
+}

--
Gitblit v1.8.0