From 7c2c6a5e5b3d9f96aef3c67573aa62bbd9a3aa7f Mon Sep 17 00:00:00 2001
From: p-honggang.li <p-honggang.li@pcitc.com>
Date: 星期四, 11 九月 2025 10:48:18 +0800
Subject: [PATCH] 修改产品类型,单位工程条偶见查询问题

---
 src/main/java/com/webmanage/dto/PointsRuleDTO.java |   40 +++++++++++++++++++++++-----------------
 1 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/webmanage/dto/PointsRuleDTO.java b/src/main/java/com/webmanage/dto/PointsRuleDTO.java
index e816a14..e65ff38 100644
--- a/src/main/java/com/webmanage/dto/PointsRuleDTO.java
+++ b/src/main/java/com/webmanage/dto/PointsRuleDTO.java
@@ -1,5 +1,6 @@
 package com.webmanage.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -16,39 +17,44 @@
 public class PointsRuleDTO {
 
     @ApiModelProperty("涓婚敭ID")
-    private Long id;
+    private Long pointsId;
 
     @ApiModelProperty("瑙勫垯鍚嶇О")
     @NotBlank(message = "瑙勫垯鍚嶇О涓嶈兘涓虹┖")
     private String ruleName;
 
+    @ApiModelProperty("瑙勫垯缂栫爜")
+    @NotBlank(message = "瑙勫垯缂栫爜涓嶈兘涓虹┖")
+    private String ruleNameCode;
+
+
     @ApiModelProperty("瑙勫垯绫诲瀷(鑾峰緱/娑堣垂)")
-    @NotBlank(message = "瑙勫垯绫诲瀷涓嶈兘涓虹┖")
-    private String ruleType;
+    @NotNull(message = "瑙勫垯绫诲瀷涓嶈兘涓虹┖")
+    private Integer ruleType;
+
+    @ApiModelProperty("瑙勫垯绫诲埆")
+    private String category;
 
     @ApiModelProperty("绉垎鍊�")
     @NotNull(message = "绉垎鍊间笉鑳戒负绌�")
     private Integer pointsValue;
 
-    @ApiModelProperty("瑙﹀彂鏉′欢")
-    @NotBlank(message = "瑙﹀彂鏉′欢涓嶈兘涓虹┖")
-    private String triggerCondition;
-
-    @ApiModelProperty("瑙﹀彂閲戦")
-    private BigDecimal triggerAmount;
-
     @ApiModelProperty("瑙勫垯鎻忚堪")
-    private String description;
+    private String ruleDescription;
 
     @ApiModelProperty("鏄惁鍚敤")
     private Boolean isEnabled = true;
 
-    @ApiModelProperty("浼樺厛绾�")
-    private Integer priority = 1;
+    @ApiModelProperty("姣忔棩涓婇檺")
+    private Integer dailyLimit;
 
-    @ApiModelProperty("鏈夋晥鏈熷紑濮嬫椂闂�")
-    private String validStartTime;
+    @ApiModelProperty("绉垎鎷ユ湁鑰�(0璐$尞鍊�1鐢ㄦ埛)")
+    private Integer pointsWinner;
 
-    @ApiModelProperty("鏈夋晥鏈熺粨鏉熸椂闂�")
-    private String validEndTime;
+    @ApiModelProperty("绉垎鏄惁鏈変笂闄�(0鏈�1娌℃湁)")
+    private Integer isLimit;
+
+    @ApiModelProperty("鎺掑簭")
+    private Integer ruleOrder;
+
 }

--
Gitblit v1.8.0