From 6c5d2211582896e9ade3288e7a0d9127210ee4b7 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期四, 07 十二月 2023 18:49:52 +0800
Subject: [PATCH] 2023-12-07 朱宝民 营销模块第一部分2

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeClientCard.java        |  173 ++++++++--------------------
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeActiveCard.java        |    3 
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeActiveCardHistory.java |  157 ++++++++++---------------
 3 files changed, 117 insertions(+), 216 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeActiveCard.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeActiveCard.java
index 3a43352..623b668 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeActiveCard.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeActiveCard.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.dy.common.po.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.Max;
 import jakarta.validation.constraints.Min;
@@ -32,7 +33,7 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @Schema(name = "寮�鍗�/琛ュ崱瀹炰綋")
-public class SeActiveCard {
+public class SeActiveCard implements BaseEntity {
     public static final long serialVersionUID = 20231191728001L;
 
     /**
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeActiveCardHistory.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeActiveCardHistory.java
index f7ebbb9..78e578a 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeActiveCardHistory.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeActiveCardHistory.java
@@ -1,5 +1,18 @@
 package com.dy.pipIrrGlobal.pojoSe;
 
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.dy.common.po.BaseEntity;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.Positive;
+import lombok.*;
+import org.hibernate.validator.constraints.Length;
+
 import java.util.Date;
 
 /**
@@ -8,124 +21,82 @@
  * @LastEditTime 2023/12/7 9:06
  * @Description
  */
+
 /**
-    * 寮�鍗�/琛ュ崱鍘嗗彶琛�
-    */
-public class SeActiveCardHistory {
+ * 寮�鍗�/琛ュ崱鍘嗗彶琛�
+ */
+
+@TableName(value="se_active_card_history", autoResultMap = true)
+@Data
+@Builder
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(name = "寮�鍗�/琛ュ崱鍘嗗彶瀹炰綋")
+public class SeActiveCardHistory implements BaseEntity {
+    public static final long serialVersionUID = 1L;
+
     /**
-    * 涓婚敭
-    */
+     * 涓婚敭
+     */
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
+    @TableId(type = IdType.INPUT)
+    @Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private Long id;
 
     /**
-    * 姘村崱缂栧彿
-    */
+     * 姘村崱缂栧彿
+     */
+    @Schema(description = "姘村崱缂栧彿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    @Length(message = "姘村崱缂栧彿涓嶅皬浜巤min}", min = 1)
     private Long cardid;
 
     /**
-    * 鍗$墖璐圭敤
-    */
+     * 鍗$墖璐圭敤
+     */
+    @Schema(description = "鍗$墖璐圭敤", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Length(message = "鍗$墖璐圭敤涓嶅皬浜巤min}瀛�", min = 1)
     private Integer cardcost;
 
     /**
-    * 浠樻鏂瑰紡缂栧彿
-    */
+     * 浠樻鏂瑰紡缂栧彿
+     */
+    @Schema(description = "浠樻鏂瑰紡缂栧彿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    @Length(message = "浠樻鏂瑰紡缂栧彿涓嶅ぇ浜巤max}锛屼笉灏忎簬{min}", min = 1, max = 4)
     private Long paymentid;
 
     /**
-    * 琛ュ崱閲戦
-    */
+     * 琛ュ崱閲戦
+     */
+    @Schema(description = "琛ュ崱閲戦", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    @Length(message = "琛ュ崱閲戦涓嶅皬浜巤min}", min = 0)
     private Double reissueamount;
 
     /**
-    * 鎿嶄綔绫诲瀷;1-寮�鍗★紝2-琛ュ崱
-    */
+     * 鎿嶄綔绫诲瀷;1-寮�鍗★紝2-琛ュ崱
+     */
+    @Schema(description = "鎿嶄綔绫诲瀷", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    @Max(message = "鎿嶄綔绫诲瀷鍙兘1鎴�2", value = 2)
+    @Min(message = "鎿嶄綔绫诲瀷鍙兘1鎴�2",value = 1)
     private Byte operatetype;
 
     /**
-    * 澶囨敞淇℃伅
-    */
+     * 澶囨敞淇℃伅
+     */
+    @Schema(description = "澶囨敞", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    @Length(message = "澶囨敞闀垮害灏忎簬{max}瀛�", min = 1, max = 200)
     private String remarks;
 
     /**
-    * 鎿嶄綔浜虹紪鍙�
-    */
+     * 鎿嶄綔浜虹紪鍙�
+     */
+    @Schema(description = "鎿嶄綔浜虹紪鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    @Positive(message = "鎿嶄綔浜虹紪鍙峰繀椤讳负澶т簬0鐨勬暣鏁�")
     private Long operator;
 
     /**
-    * 鎿嶄綔鏃堕棿
-    */
+     * 鎿嶄綔鏃堕棿
+     */
+    @Schema(description = "鎿嶄綔鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private Date operatedt;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getCardid() {
-        return cardid;
-    }
-
-    public void setCardid(Long cardid) {
-        this.cardid = cardid;
-    }
-
-    public Integer getCardcost() {
-        return cardcost;
-    }
-
-    public void setCardcost(Integer cardcost) {
-        this.cardcost = cardcost;
-    }
-
-    public Long getPaymentid() {
-        return paymentid;
-    }
-
-    public void setPaymentid(Long paymentid) {
-        this.paymentid = paymentid;
-    }
-
-    public Double getReissueamount() {
-        return reissueamount;
-    }
-
-    public void setReissueamount(Double reissueamount) {
-        this.reissueamount = reissueamount;
-    }
-
-    public Byte getOperatetype() {
-        return operatetype;
-    }
-
-    public void setOperatetype(Byte operatetype) {
-        this.operatetype = operatetype;
-    }
-
-    public String getRemarks() {
-        return remarks;
-    }
-
-    public void setRemarks(String remarks) {
-        this.remarks = remarks;
-    }
-
-    public Long getOperator() {
-        return operator;
-    }
-
-    public void setOperator(Long operator) {
-        this.operator = operator;
-    }
-
-    public Date getOperatedt() {
-        return operatedt;
-    }
-
-    public void setOperatedt(Date operatedt) {
-        this.operatedt = operatedt;
-    }
 }
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeClientCard.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeClientCard.java
index 3982c70..ed592ae 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeClientCard.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeClientCard.java
@@ -1,5 +1,18 @@
 package com.dy.pipIrrGlobal.pojoSe;
 
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.dy.common.po.BaseEntity;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Positive;
+import jakarta.validation.constraints.Size;
+import lombok.*;
+import org.hibernate.validator.constraints.Length;
+
 import java.util.Date;
 
 /**
@@ -8,202 +21,118 @@
  * @LastEditTime 2023/12/7 9:06
  * @Description
  */
+
 /**
-    * 鍐滄埛姘村崱琛�
-    */
-public class SeClientCard {
+ * 鍐滄埛姘村崱琛�
+ */
+
+@TableName(value="se_client_card", autoResultMap = true)
+@Data
+@Builder
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(name = "鍐滄埛姘村崱瀹炰綋")
+public class SeClientCard implements BaseEntity {
+    public static final long serialVersionUID = 1L;
+
     /**
     * 涓婚敭
     */
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
+    @TableId(type = IdType.INPUT)
+    @Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private Long id;
 
     /**
     * 姘村崱鍦板潃
     */
+    @Schema(description = "姘村崱鍦板潃", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    @NotBlank(message = "姘村崱鍦板潃涓嶈兘涓虹┖")
     private String cardaddr;
 
     /**
     * 鍐滄埛ID
     */
+    @Schema(description = "鍐滄埛ID", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    @Positive(message = "鍐滄埛ID蹇呴』涓哄ぇ浜�0鐨勬暣鏁�")
     private Long clientid;
 
     /**
     * 浣欓
     */
+    @Schema(description = "浣欓", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private Double money;
 
     /**
     * 鍗$墖鐘舵��;1-姝e父锛�2-宸叉敞閿�锛�3-宸叉寕澶�
     */
+    @Schema(description = "鍗$墖鐘舵��", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    @Positive(message = "鍗$墖鐘舵�佸繀椤讳负1鎴�2鎴�3")
+    @Size(min = 1, max = 3)
     private Byte state;
 
     /**
     * 寮�鍗℃椂闂�
     */
+    @Schema(description = "寮�鍗℃椂闂�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private Date createdt;
 
     /**
     * 琛ュ崱鏃堕棿
     */
+    @Schema(description = "琛ュ崱鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private Date replacedt;
 
     /**
     * 鍏呭�兼椂闂�
     */
+    @Schema(description = "鍏呭�兼椂闂�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private Date rechargedt;
 
     /**
     * 鎸傚け鏃堕棿
     */
+    @Schema(description = "鎸傚け鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private Date lossdtdt;
 
     /**
     * 娉ㄩ攢鏃堕棿
     */
+    @Schema(description = "娉ㄩ攢鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private Date canceldt;
 
     /**
     * 瑙i攣鏃堕棿
     */
+    @Schema(description = "瑙i攣鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private Date unlockdt;
 
     /**
     * 鍐叉鏃堕棿
     */
+    @Schema(description = "鍐叉鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private Date reversaldt;
 
     /**
     * 娑堣垂鏃堕棿
     */
+    @Schema(description = "娑堣垂鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private Date consumedt;
 
     /**
     * 鏈�鍚庢搷浣滅被鍨�;1-寮�鍗★紝2-琛ュ崱锛�3-鍏呭�硷紝4-鎸傚け锛�5-娉ㄩ攢锛�6-瑙i攣锛�7-鍐叉锛�8-娑堣垂
     */
+    @Schema(description = "鏈�鍚庢搷浣滅被鍨�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    @Positive(message = "鍗$墖鐘舵�佸繀椤讳负1鍒�8鐨勬鏁存暟")
+    @Size(min = 1, max = 8)
     private Byte lastoper;
 
     /**
     * 澶囨敞淇℃伅
     */
+    @Schema(description = "澶囨敞", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    @Length(message = "澶囨敞闀垮害灏忎簬{max}瀛�", min = 1, max = 200)
     private String remarks;
 
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getCardaddr() {
-        return cardaddr;
-    }
-
-    public void setCardaddr(String cardaddr) {
-        this.cardaddr = cardaddr;
-    }
-
-    public Long getClientid() {
-        return clientid;
-    }
-
-    public void setClientid(Long clientid) {
-        this.clientid = clientid;
-    }
-
-    public Double getMoney() {
-        return money;
-    }
-
-    public void setMoney(Double money) {
-        this.money = money;
-    }
-
-    public Byte getState() {
-        return state;
-    }
-
-    public void setState(Byte state) {
-        this.state = state;
-    }
-
-    public Date getCreatedt() {
-        return createdt;
-    }
-
-    public void setCreatedt(Date createdt) {
-        this.createdt = createdt;
-    }
-
-    public Date getReplacedt() {
-        return replacedt;
-    }
-
-    public void setReplacedt(Date replacedt) {
-        this.replacedt = replacedt;
-    }
-
-    public Date getRechargedt() {
-        return rechargedt;
-    }
-
-    public void setRechargedt(Date rechargedt) {
-        this.rechargedt = rechargedt;
-    }
-
-    public Date getLossdtdt() {
-        return lossdtdt;
-    }
-
-    public void setLossdtdt(Date lossdtdt) {
-        this.lossdtdt = lossdtdt;
-    }
-
-    public Date getCanceldt() {
-        return canceldt;
-    }
-
-    public void setCanceldt(Date canceldt) {
-        this.canceldt = canceldt;
-    }
-
-    public Date getUnlockdt() {
-        return unlockdt;
-    }
-
-    public void setUnlockdt(Date unlockdt) {
-        this.unlockdt = unlockdt;
-    }
-
-    public Date getReversaldt() {
-        return reversaldt;
-    }
-
-    public void setReversaldt(Date reversaldt) {
-        this.reversaldt = reversaldt;
-    }
-
-    public Date getConsumedt() {
-        return consumedt;
-    }
-
-    public void setConsumedt(Date consumedt) {
-        this.consumedt = consumedt;
-    }
-
-    public Byte getLastoper() {
-        return lastoper;
-    }
-
-    public void setLastoper(Byte lastoper) {
-        this.lastoper = lastoper;
-    }
-
-    public String getRemarks() {
-        return remarks;
-    }
-
-    public void setRemarks(String remarks) {
-        this.remarks = remarks;
-    }
 }
\ No newline at end of file

--
Gitblit v1.8.0