refactor(entity): 重构实体类并优化券码生成逻辑

- 移除 BaseEntity 类，将通用字段直接集成到各实体类中
- 更新实体类字段名称，如 createdTime 改为 createTime- 在 PriceVoucherCode 实体中添加生成安全券码的逻辑
- 更新相关服务类中的方法调用，以适应新的字段名称

src/main/java/com/ycwl/basic/pricing/entity/BaseEntity.java

@@ -1,29 +0,0 @@
-package com.ycwl.basic.pricing.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * 基础实体类
- */
-@Data
-public class BaseEntity {
-    
-    @TableId(type = IdType.AUTO)
-    private Long id;
-    
-    private Date createdTime;
-    
-    private Date updatedTime;
-    
-    private Long createBy;
-    
-    private Long updateBy;
-    
-    private Integer deleted;
-    
-    private Date deletedAt;
-}

src/main/java/com/ycwl/basic/pricing/entity/PriceBundleConfig.java

@@ -1,23 +1,27 @@
 package com.ycwl.basic.pricing.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
+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.ycwl.basic.pricing.dto.BundleProductItem;
 import com.ycwl.basic.pricing.handler.BundleProductListTypeHandler;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import org.apache.ibatis.type.JdbcType;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 /**
  * 一口价配置实体
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
 @TableName("price_bundle_config")
-public class PriceBundleConfig extends BaseEntity {
+public class PriceBundleConfig {
+    
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
     
     /**
      * 套餐名称
@@ -55,4 +59,18 @@ public class PriceBundleConfig extends BaseEntity {
      * 是否启用
      */
     private Boolean isActive;
+    
+    @TableField("create_time")
+    private Date createTime;
+    
+    @TableField("update_time")
+    private Date updateTime;
+    
+    private Long createBy;
+    
+    private Long updateBy;
+    
+    private Integer deleted;
+    
+    private Date deletedAt;
 }

src/main/java/com/ycwl/basic/pricing/entity/PriceCouponClaimRecord.java

@@ -1,9 +1,11 @@
 package com.ycwl.basic.pricing.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.ycwl.basic.pricing.enums.CouponStatus;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
 import java.util.Date;
 
@@ -11,9 +13,11 @@ import java.util.Date;
  * 优惠券领用记录实体
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
 @TableName("price_coupon_claim_record")
-public class PriceCouponClaimRecord extends BaseEntity {
+public class PriceCouponClaimRecord {
+    
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
     
     /**
      * 优惠券ID
@@ -49,4 +53,14 @@ public class PriceCouponClaimRecord extends BaseEntity {
      * 景区ID - 记录优惠券在哪个景区被领取/使用
      */
     private String scenicId;
+    
+    @TableField("create_time")
+    private Date createTime;
+    
+    @TableField("update_time")
+    private Date updateTime;
+    
+    private Integer deleted;
+    
+    private Date deletedAt;
 }

src/main/java/com/ycwl/basic/pricing/entity/PriceCouponConfig.java

@@ -1,20 +1,25 @@
 package com.ycwl.basic.pricing.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.ycwl.basic.pricing.enums.CouponType;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * 优惠券配置实体
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
 @TableName("price_coupon_config")
-public class PriceCouponConfig extends BaseEntity {
+public class PriceCouponConfig {
+    
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
     
     /**
      * 优惠券名称
@@ -75,4 +80,18 @@ public class PriceCouponConfig extends BaseEntity {
      * 景区ID - 限制优惠券只能在该景区使用
      */
     private String scenicId;
+    
+    @TableField("create_time")
+    private Date createTime;
+    
+    @TableField("update_time")
+    private Date updateTime;
+    
+    private Long createBy;
+    
+    private Long updateBy;
+    
+    private Integer deleted;
+    
+    private Date deletedAt;
 }

src/main/java/com/ycwl/basic/pricing/entity/PriceProductConfig.java

@@ -1,18 +1,23 @@
 package com.ycwl.basic.pricing.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 lombok.Data;
-import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 商品价格配置实体
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
 @TableName("price_product_config")
-public class PriceProductConfig extends BaseEntity {
+public class PriceProductConfig {
+    
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
     
     /**
      * 商品类型
@@ -53,4 +58,18 @@ public class PriceProductConfig extends BaseEntity {
      * 是否启用
      */
     private Boolean isActive;
+    
+    @TableField("create_time")
+    private Date createTime;
+    
+    @TableField("update_time")
+    private Date updateTime;
+    
+    private Long createBy;
+    
+    private Long updateBy;
+    
+    private Integer deleted;
+    
+    private Date deletedAt;
 }

src/main/java/com/ycwl/basic/pricing/entity/PriceTierConfig.java

@@ -1,18 +1,23 @@
 package com.ycwl.basic.pricing.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 lombok.Data;
-import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 阶梯定价配置实体
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
 @TableName("price_tier_config")
-public class PriceTierConfig extends BaseEntity {
+public class PriceTierConfig {
+    
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
     
     /**
      * 商品类型
@@ -63,4 +68,18 @@ public class PriceTierConfig extends BaseEntity {
      * 是否启用
      */
     private Boolean isActive;
+    
+    @TableField("create_time")
+    private Date createTime;
+    
+    @TableField("update_time")
+    private Date updateTime;
+    
+    private Long createBy;
+    
+    private Long updateBy;
+    
+    private Integer deleted;
+    
+    private Date deletedAt;
 }

src/main/java/com/ycwl/basic/pricing/entity/PriceVoucherBatchConfig.java

@@ -1,10 +1,10 @@
 package com.ycwl.basic.pricing.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 lombok.Data;
-import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -13,9 +13,8 @@ import java.util.Date;
  * 券码批次配置实体
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
 @TableName("price_voucher_batch_config")
-public class PriceVoucherBatchConfig extends BaseEntity {
+public class PriceVoucherBatchConfig {
     
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
@@ -65,8 +64,17 @@ public class PriceVoucherBatchConfig extends BaseEntity {
      */
     private Integer status;
     
-    /**
-     * 创建人ID
-     */
+    @TableField("create_time")
+    private Date createTime;
+    
+    @TableField("update_time")
+    private Date updateTime;
+    
     private Long createBy;
+    
+    private Long updateBy;
+    
+    private Integer deleted;
+    
+    private Date deletedAt;
 }

src/main/java/com/ycwl/basic/pricing/entity/PriceVoucherCode.java

@@ -1,10 +1,10 @@
 package com.ycwl.basic.pricing.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 lombok.Data;
-import lombok.EqualsAndHashCode;
 
 import java.util.Date;
 
@@ -12,9 +12,8 @@ import java.util.Date;
  * 券码实体
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
 @TableName("price_voucher_code")
-public class PriceVoucherCode extends BaseEntity {
+public class PriceVoucherCode {
     
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
@@ -58,4 +57,14 @@ public class PriceVoucherCode extends BaseEntity {
      * 使用备注
      */
     private String remark;
+    
+    @TableField("create_time")
+    private Date createTime;
+    
+    @TableField("update_time")
+    private Date updateTime;
+    
+    private Integer deleted;
+    
+    private Date deletedAt;
 }