From f0da95925bcb8ad19b0d1cc78afe4b4a4ae188a6 Mon Sep 17 00:00:00 2001
From: p-honggang.li <p-honggang.li@pcitc.com>
Date: 星期四, 28 八月 2025 09:55:51 +0800
Subject: [PATCH] Merge branch 'master' of http://xearth.cn:6600/r/web-manage/web-manage-back
---
src/main/java/com/webmanage/entity/PointsRule.java | 68 +++++++++++++++++++--------------
1 files changed, 39 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/webmanage/entity/PointsRule.java b/src/main/java/com/webmanage/entity/PointsRule.java
index 0a9a8a1..470a7ac 100644
--- a/src/main/java/com/webmanage/entity/PointsRule.java
+++ b/src/main/java/com/webmanage/entity/PointsRule.java
@@ -18,7 +18,7 @@
*/
@Data
@EqualsAndHashCode(callSuper = false)
-@TableName("points_rule")
+@TableName("tb_points_rule")
@ApiModel(value = "PointsRule", description = "绉垎瑙勫垯")
public class PointsRule implements Serializable {
@@ -28,25 +28,25 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
+ @ApiModelProperty("points_id")
+ @TableField("points_id")
+ private Long pointsId;
+
+ @ApiModelProperty("瑙勫垯绫诲瀷(0鑾峰緱/1娑堣垂)")
+ @TableField("rule_type")
+ private Integer ruleType;
+
+ @ApiModelProperty("瑙勫垯绫诲埆")
+ @TableField("category")
+ private String category;
+
@ApiModelProperty("瑙勫垯鍚嶇О")
@TableField("rule_name")
private String ruleName;
- @ApiModelProperty("瑙勫垯绫诲瀷(鑾峰緱/娑堣垂)")
- @TableField("rule_type")
- private String ruleType;
-
- @ApiModelProperty("绉垎鍊�")
- @TableField("points_value")
- private Integer pointsValue;
-
- @ApiModelProperty("瑙﹀彂鏉′欢")
- @TableField("trigger_condition")
- private String triggerCondition;
-
- @ApiModelProperty("瑙﹀彂閲戦")
- @TableField("trigger_amount")
- private BigDecimal triggerAmount;
+ @ApiModelProperty("瑙勫垯缂栫爜")
+ @TableField("rule_name_code")
+ private String ruleNameCode;
@ApiModelProperty("瑙勫垯鎻忚堪")
@TableField("rule_description")
@@ -54,19 +54,7 @@
@ApiModelProperty("鏄惁鍚敤")
@TableField("is_enabled")
- private Boolean isEnabled;
-
- @ApiModelProperty("浼樺厛绾�")
- @TableField("priority")
- private Integer priority;
-
- @ApiModelProperty("鏈夋晥鏈熷紑濮嬫椂闂�")
- @TableField("valid_start_time")
- private LocalDateTime validStartTime;
-
- @ApiModelProperty("鏈夋晥鏈熺粨鏉熸椂闂�")
- @TableField("valid_end_time")
- private LocalDateTime validEndTime;
+ private Integer isEnabled;
@ApiModelProperty("鍒涘缓鏃堕棿")
@TableField(value = "created_at", fill = FieldFill.INSERT)
@@ -80,4 +68,26 @@
@TableLogic
@TableField("deleted")
private Integer deleted;
+
+
+ @ApiModelProperty("绉垎鎷ユ湁鑰�(0璐＄尞鍊�1鐢ㄦ埛)")
+ @TableField("points_winner")
+ private Integer pointsWinner;
+
+ @ApiModelProperty("绉垎鏄惁鏈変笂闄�(0鏈�1娌℃湁)")
+ @TableField("is_limit")
+ private Integer isLimit;
+
+ @ApiModelProperty("鎺掑簭")
+ @TableField("rule_order")
+ private Integer ruleOrder;
+
+ @ApiModelProperty("绉垎鍊�")
+ @TableField("points_value")
+ private Integer pointsValue;
+
+ @ApiModelProperty("姣忔棩涓婇檺")
+ @TableField("daily_limit")
+ private Integer dailyLimit;
+
}
--
Gitblit v1.8.0