feat:钱包冻结流程

pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/excel/WalletRechargeExcelDto.java

@@ -31,7 +31,7 @@ public class WalletRechargeExcelDto {
     private Long lineNum;
 
     @ColumnWidth(100)
-    @ExcelProperty("用户名")
+    @ExcelProperty("用户姓名")
     private String username;
 
     @ColumnWidth(100)

pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/WalletFreezeEntity.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import com.bsd.pjcloud.common.core.util.TenantTable;
+
 import java.time.LocalDateTime;
 
 /**
@@ -24,94 +25,94 @@ import java.time.LocalDateTime;
 public class WalletFreezeEntity extends Model<WalletFreezeEntity> {
 
 
-	/**
-	* 编号
-	*/
+    /**
+     * 编号
+     */
     @TableId(type = IdType.ASSIGN_ID)
-    @Schema(description="编号")
+    @Schema(description = "编号")
     private Long id;
 
-	/**
-	 * 流程id
-	 */
-	@Schema(description = "流程id")
-	private String processId;
+    /**
+     * 流程id
+     */
+    @Schema(description = "流程id")
+    private String processId;
 
-	/**
-	 * 流程状态
-	 */
-	@Schema(description = "流程状态")
-	private String processStatus;
+    /**
+     * 流程状态
+     */
+    @Schema(description = "流程状态")
+    private String processStatus;
 
-	/**
-	* 钱包id
-	*/
-    @Schema(description="钱包id")
+    /**
+     * 钱包id
+     */
+    @Schema(description = "钱包id")
     private Long walletId;
 
-	/**
-	* 用户id
-	*/
-    @Schema(description="用户id")
+    /**
+     * 用户id
+     */
+    @Schema(description = "用户id")
     private Long userId;
 
-	/**
-	 * 部门id
-	 */
-	@Schema(description="部门id")
-	private Long deptId;
+    /**
+     * 部门id
+     */
+    @Schema(description = "部门id")
+    private Long deptId;
 
-	/**
-	* 冻结状态
-	*/
-    @Schema(description="冻结状态")
+    /**
+     * 冻结状态
+     */
+    @Schema(description = "冻结状态")
     private String freeStatus;
 
-	/**
-	* 备注
-	*/
-    @Schema(description="备注")
+    /**
+     * 备注
+     */
+    @Schema(description = "备注")
     private String remark;
 
-	/**
-	* 创建人
-	*/
-	@TableField(fill = FieldFill.INSERT)
-    @Schema(description="创建人")
+    /**
+     * 创建人
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "创建人")
     private String createBy;
 
-	/**
-	* 创建时间
-	*/
-	@TableField(fill = FieldFill.INSERT)
-    @Schema(description="创建时间")
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "创建时间")
     private LocalDateTime createTime;
 
-	/**
-	* 修改人
-	*/
-	@TableField(fill = FieldFill.INSERT_UPDATE)
-    @Schema(description="修改人")
+    /**
+     * 修改人
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @Schema(description = "修改人")
     private String updateBy;
 
-	/**
-	* 修改时间
-	*/
-	@TableField(fill = FieldFill.INSERT_UPDATE)
-    @Schema(description="修改时间")
+    /**
+     * 修改时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @Schema(description = "修改时间")
     private LocalDateTime updateTime;
 
-	/**
-	* 删除标记
-	*/
+    /**
+     * 删除标记
+     */
     @TableLogic
-	@TableField(fill = FieldFill.INSERT)
-    @Schema(description="删除标记")
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "删除标记")
     private String delFlag;
 
-	/**
-	* 租户ID
-	*/
-    @Schema(description="租户ID")
+    /**
+     * 租户ID
+     */
+    @Schema(description = "租户ID")
     private Long tenantId;
 }

pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/WalletManageEntity.java

@@ -3,8 +3,7 @@ package com.bsd.pjcloud.wallet.api.entity;
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import lombok.*;
 import com.bsd.pjcloud.common.core.util.TenantTable;
 
 import java.time.LocalDateTime;
@@ -15,6 +14,9 @@ import java.time.LocalDateTime;
  * @author dzc
  * @date 2024-12-30 09:06:35
  */
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
 @Data
 @TenantTable
 @TableName("wallet_manage")
@@ -82,7 +84,7 @@ public class WalletManageEntity extends Model<WalletManageEntity> {
      * 是否冻结饭卡
      */
     @Schema(description = "是否冻结饭卡")
-    private Boolean isFreeze;
+    private String isFreeze;
 
     /**
      * 绑定饭卡时间
@@ -91,7 +93,7 @@ public class WalletManageEntity extends Model<WalletManageEntity> {
     private LocalDateTime activeBindTime;
 
     /**
-     * 饭卡绑定状态
+     * 饭卡绑定状态 1已经绑定 0未绑定
      */
     @Schema(description = "饭卡绑定状态")
     private String activeBindStatus;

pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/base/BaseWalletInterface.java

@@ -32,9 +32,9 @@ public interface BaseWalletInterface {
 
     void setWalletFreezePrice(Integer walletFreezePrice);
 
-    Boolean getWalletIsFreeze();
+    String getWalletIsFreeze();
 
-    void setWalletIsFreeze(Boolean walletIsFreeze);
+    void setWalletIsFreeze(String walletIsFreeze);
 
     LocalDateTime getWalletActiveBindTime();
 

pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/transaction/WalletTransactionVo.java

@@ -48,7 +48,7 @@ public class WalletTransactionVo extends WalletTransactionEntity implements Base
 
     private Integer walletFreezePrice;
 
-    private Boolean walletIsFreeze;
+    private String walletIsFreeze;
 
     private LocalDateTime walletActiveBindTime;