From 1b0cf0db5c82ea8308d2f338973a91555787c34d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 三月 2025 11:17:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 server/services/src/main/java/com/doumee/dao/business/model/Refund.java |   49 ++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Refund.java b/server/services/src/main/java/com/doumee/dao/business/model/Refund.java
index 9c9819e..cee6f51 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Refund.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Refund.java
@@ -1,15 +1,14 @@
 package com.doumee.dao.business.model;
 
+import com.baomidou.mybatisplus.annotation.*;
 import com.doumee.core.annotation.excel.ExcelColumn;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import java.util.Date;
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * 閫�娆句俊鎭〃
@@ -27,7 +26,7 @@
 
     @ApiModelProperty(value = "鍒涘缓鏃堕棿")
     @ExcelColumn(name="鍒涘缓鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    //@JsonFormat(pattern = "yyyy-MM-dd")
     private Date createDate;
 
     @ApiModelProperty(value = "鍒涘缓浜�")
@@ -36,7 +35,7 @@
 
     @ApiModelProperty(value = "缂栬緫鏃堕棿")
     @ExcelColumn(name="缂栬緫鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    //@JsonFormat(pattern = "yyyy-MM-dd")
     private Date editDate;
 
     @ApiModelProperty(value = "缂栬緫浜�")
@@ -45,6 +44,7 @@
 
     @ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�", example = "1")
     @ExcelColumn(name="鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�")
+    @TableLogic
     private Integer isdeleted;
 
     @ApiModelProperty(value = "澶囨敞")
@@ -57,7 +57,11 @@
 
     @ApiModelProperty(value = "鐢ㄦ埛缂栫爜锛堝叧鑱攎ember琛級", example = "1")
     @ExcelColumn(name="鐢ㄦ埛缂栫爜锛堝叧鑱攎ember琛級")
-    private BigDecimal memberId;
+    private String memberId;
+
+    @ApiModelProperty(value = "鍙��閲戦", example = "1")
+    @ExcelColumn(name="鍙��鍥炴娂閲戯紙鍏冿級" )
+    private BigDecimal canBalance;
 
     @ApiModelProperty(value = "浜ゆ槗閲戦", example = "1")
     @ExcelColumn(name="浜ゆ槗閲戦")
@@ -81,12 +85,15 @@
 
     @ApiModelProperty(value = "瀹屾垚鏃堕棿")
     @ExcelColumn(name="瀹屾垚鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    //@JsonFormat(pattern = "yyyy-MM-dd")
     private Date doneDate;
 
-    @ApiModelProperty(value = "閫�娆剧被鍨� 0缁撶畻閫�娆� 1寮哄埗缁撶畻閫�娆� 2缁撶畻鍚庨��娆�", example = "1")
-    @ExcelColumn(name="閫�娆剧被鍨� 0缁撶畻閫�娆� 1寮哄埗缁撶畻閫�娆� 2缁撶畻鍚庨��娆�")
+    @ApiModelProperty(value = "閫�娆剧被鍨� 0鐢ㄦ埛缁撶畻閫�娆� 1骞冲彴鑷姩缁撶畻閫�娆� 2寮哄埗缁撶畻閫�娆� 3缁撶畻鍚庨��娆�'", example = "1")
+    @ExcelColumn(name="閫�娆剧被鍨� 0鐢ㄦ埛缁撶畻閫�娆� 1骞冲彴鑷姩缁撶畻閫�娆� 2寮哄埗缁撶畻閫�娆� 3缁撶畻鍚庨��娆�'")
     private Integer type;
+    @ApiModelProperty(value = "閫�娆剧被鍨� 0缁撶畻閫�娆� 1寮哄埗缁撶畻閫�娆� 2缁撶畻鍚庨��娆�", example = "1")
+    @TableField(exist = false)
+    private List<Integer> typeList;
 
     @ApiModelProperty(value = "閫�娆惧叧鑱旇鍗曠紪鐮�")
     @ExcelColumn(name="閫�娆惧叧鑱旇鍗曠紪鐮�")
@@ -95,5 +102,29 @@
     @ApiModelProperty(value = "閫�娆惧師鍥�")
     @ExcelColumn(name="閫�娆惧師鍥�")
     private String reason;
+    @ApiModelProperty(value = "鎿嶄綔浜�")
+    @TableField(exist = false)
+    private String creatorName;
+
+    @ApiModelProperty(value = "鐢ㄦ埛")
+    @TableField(exist = false)
+    private String openid;
+    @ApiModelProperty(value = "鏀粯鎶奸噾浜ゆ槗鍗曞彿")
+    @TableField(exist = false)
+    private String payOnlineOrderid;
+
+
+    @ApiModelProperty(value = "浜ゆ槗绗旀暟", example = "0")
+    @TableField(exist = false)
+    private int countNum;
+    @ApiModelProperty(value = "鏌ヨ寮�濮嬫棩鏈燂紙鍖呭惈锛�", example = "2023-10-01 15:12:01")
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date startDate;
+    @ApiModelProperty(value = "鏌ヨ鎴鏃ユ湡锛堝寘鍚級", example = "2023-10-09 15:12:05")
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endDate;
+
 
 }

--
Gitblit v1.9.3