会员卡管理

qmjszx-business/src/main/java/beilv/usermembershipcard/domain/UserMembershipCard.java

@@ -1,9 +1,9 @@
 package beilv.usermembershipcard.domain;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import beilv.common.annotation.Excel;
 import beilv.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * 用户会员卡对象 user_membership_card
@@ -11,18 +11,23 @@ import beilv.common.core.domain.BaseEntity;
  * @author ruoyi
  * @date 2025-01-02
  */
-public class UserMembershipCard extends BaseEntity
-{
+public class UserMembershipCard extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 主键 */
+    /**
+     * 主键
+     */
     private Long id;
 
-    /** 用户id */
+    /**
+     * 用户id
+     */
 //    @Excel(name = "用户id")
     private String userId;
 
-    /** 卡种id */
+    /**
+     * 卡种id
+     */
 //    @Excel(name = "卡种id")
     private String recordId;
 
@@ -38,23 +43,49 @@ public class UserMembershipCard extends BaseEntity
     @Excel(name = "卡种名称")
     private String cardName;
 
-    /** 总次数 */
+    /**
+     * 总次数
+     */
     @Excel(name = "总次数")
     private Integer totalNumber;
 
-    /** 剩余次数 */
+    /**
+     * 剩余次数
+     */
     @Excel(name = "剩余次数")
     private Integer remainingNumber;
 
-    /** 版本 */
+    /**
+     * 版本
+     */
 //    @Excel(name = "版本")
     private String version;
 
+    private String cardType;
+
+    private String cardTypeLable;
+
     private String state;
 
     @Excel(name = "状态")
     private String stateLabel;
 
+    public String getCardType() {
+        return cardType;
+    }
+
+    public void setCardType(String cardType) {
+        this.cardType = cardType;
+    }
+
+    public String getCardTypeLable() {
+        return cardTypeLable;
+    }
+
+    public void setCardTypeLable(String cardTypeLable) {
+        this.cardTypeLable = cardTypeLable;
+    }
+
     public String getStateLabel() {
 
         return stateLabel;
@@ -112,68 +143,58 @@ public class UserMembershipCard extends BaseEntity
         this.cardName = cardName;
     }
 
-    public void setId(Long id)
-    {
+    public void setId(Long id) {
         this.id = id;
     }
 
-    public Long getId()
-    {
+    public Long getId() {
         return id;
     }
 
-    public void setUserId(String userId)
-    {
+    public void setUserId(String userId) {
         this.userId = userId;
     }
 
-    public String getUserId()
-    {
+    public String getUserId() {
         return userId;
     }
 
-    public void setTotalNumber(Integer totalNumber)
-    {
+    public void setTotalNumber(Integer totalNumber) {
         this.totalNumber = totalNumber;
     }
 
-    public Integer getTotalNumber()
-    {
+    public Integer getTotalNumber() {
         return totalNumber;
     }
 
-    public void setRemainingNumber(Integer remainingNumber)
-    {
+    public void setRemainingNumber(Integer remainingNumber) {
         this.remainingNumber = remainingNumber;
     }
 
-    public Integer getRemainingNumber()
-    {
+    public Integer getRemainingNumber() {
         return remainingNumber;
     }
 
-    public void setVersion(String version)
-    {
+    public void setVersion(String version) {
         this.version = version;
     }
 
-    public String getVersion()
-    {
+    public String getVersion() {
         return version;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("userId", getUserId())
-            .append("totalNumber", getTotalNumber())
-            .append("remainingNumber", getRemainingNumber())
-            .append("version", getVersion())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("userId", getUserId())
+                .append("totalNumber", getTotalNumber())
+                .append("remainingNumber", getRemainingNumber())
+                .append("version", getVersion())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .toString();
     }
 }

qmjszx-business/src/main/resources/mapper/card/UserMembershipCardMapper.xml

@@ -51,6 +51,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="realName != null  and realName != ''"> and b.real_name like concat('%', #{realName}, '%')</if>
             <if test="mobile != null  and mobile != ''"> and b.mobile like concat('%', #{mobile}, '%')</if>
             <if test="cardName != null  and cardName != ''"> and c.name like concat('%', #{cardName}, '%')</if>
+            <if test="cardType != null  and cardType != ''"> and c.card_type = #{cardType}</if>
+            <if test="state != null  and state != ''"> and a.state = #{state}</if>
         </where>
         order by a.create_time desc
     </select>