TRX vor 1 Jahr
Ursprung
Commit
43b8b83896

+ 9 - 9
FullCardClient/src/main/java/com/zhongshu/card/client/model/school/CardInfoModel.java

@@ -23,18 +23,18 @@ public class CardInfoModel extends SuperModel {
     @Schema(description = "卡片号码")
     private String code;
 
-    @Schema(description = "卡片uid")
-    private String cardUid;
-
-    @Schema(description = "卡片Rfid")
-    private String cardRfid;
-
-    @Schema(description = "卡片的iccid")
-    private String iccid;
-
     @Schema(description = "卡片状态")
     private CardState cardState;
 
+    private String cardStateStr;
+
+    public String getCardStateStr() {
+        if (cardState != null) {
+            return cardState.getRemark();
+        }
+        return "";
+    }
+
     @Schema(description = "所属用户")
     private UserCountModel userAccount;
 

+ 1 - 10
FullCardClient/src/main/java/com/zhongshu/card/client/model/school/CardInfoParam.java

@@ -21,16 +21,7 @@ public class CardInfoParam extends SuperParam {
     @Schema(description = "卡片号码")
     private String code;
 
-    @Schema(description = "卡片uid")
-    private String cardUid;
-
-    @Schema(description = "卡片Rfid")
-    private String cardRfid;
-
-    @Schema(description = "卡片的iccid")
-    private String iccid;
-
-    @Schema(description = "卡片状态")
+    @Schema(description = "卡片状态", hidden = true)
     private CardState cardState = CardState.Enable;
 
     @Schema(description = "所属用户userId", hidden = true)

+ 8 - 2
FullCardClient/src/main/java/com/zhongshu/card/client/model/school/CardLossParam.java

@@ -17,8 +17,14 @@ import lombok.NoArgsConstructor;
 public class CardLossParam {
     @Schema(description = "数据ID")
     private String id;
-    @Schema(description = "卡片iccid")
-    private String iccid;
+
+    @Schema(description = "卡片code")
+    private String code;
+
+    private String userName;
+
+    private String phone;
+
     @Schema(description = "密码")
     private String passWord;
 }

+ 19 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/utils/type/CardOperationType.java

@@ -0,0 +1,19 @@
+package com.zhongshu.card.client.utils.type;
+
+import lombok.Getter;
+
+/**
+ *
+ */
+public enum CardOperationType {
+    Loss("挂失"),
+    Enable("解除挂失"),
+    ;
+
+    @Getter
+    private String remark;
+
+    CardOperationType(String remark) {
+        this.remark = remark;
+    }
+}