From 8297013f990a5440fa8bebb8c0eb9fb0f6af4862 Mon Sep 17 00:00:00 2001
From: zuoxiao <lf_zuo@163.com>
Date: 星期三, 25 六月 2025 09:30:26 +0800
Subject: [PATCH] feat(card): 添加管理卡状态枚举并更新相关逻辑

---
 pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/CardSv.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/CardSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/CardSv.java
index 33e01ca..674f238 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/CardSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/CardSv.java
@@ -14,6 +14,7 @@
 import com.dy.pipIrrTerminal.card.qo.QoLostCards;
 import com.dy.pipIrrTerminal.card.enums.CardStateENUM;
 import com.dy.pipIrrTerminal.card.enums.LastOperateENUM;
+import com.dy.pipIrrTerminal.card.enums.ManagementCardStateENUM;
 import com.dy.pipIrrTerminal.card.enums.OperateTypeENUM;
 import com.dy.pipIrrTerminal.card.enums.RechargeTypeENUM;
 import lombok.extern.slf4j.Slf4j;
@@ -22,6 +23,7 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import com.dy.common.util.IDLongGenerator;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -57,6 +59,9 @@
 
     @Autowired
     private SeManagementCardMapper seManagementCardMapper;
+
+    @Autowired
+    private IDLongGenerator idLongGenerator;
 
     @Value("${project.projectNo}")
     private Integer projectNo;
@@ -1306,8 +1311,8 @@
             // 鍙傝�僼ermActiveCard閫昏緫锛氱敓鎴愯鍗曞彿
             String orderNo = generateOrderNo();
 
-            // 鍙傝�僼ermActiveCard閫昏緫锛氱敓鎴愬敮涓�ID锛屼娇鐢ㄦ椂闂存埑
-            Long id = System.currentTimeMillis();
+            // 浣跨敤IDLongGenerator鐢熸垚鍞竴ID
+            Long id = idLongGenerator.generate();
             Date createTime = new Date();
 
             // 鏋勫缓绠$悊鍗″璞�
@@ -1325,6 +1330,7 @@
                     .domain(dto.getDomain())
                     .openClostTime(dto.getOpenClostTime())
                     .remarks(dto.getRemarks())
+                    .state(ManagementCardStateENUM.NORMAL.getCode()) // 榛樿鐘舵�佷负姝e父
                     .build();
 
             // 鎻掑叆鏁版嵁搴�

--
Gitblit v1.8.0