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/Goodsorder.java | 75 +++++++++++++++++++++++--------------
1 files changed, 47 insertions(+), 28 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Goodsorder.java b/server/services/src/main/java/com/doumee/dao/business/model/Goodsorder.java
index 999fcfb..3fd1618 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Goodsorder.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Goodsorder.java
@@ -1,6 +1,7 @@
package com.doumee.dao.business.model;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.doumee.core.annotation.excel.ExcelColumn;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -8,6 +9,7 @@
import io.swagger.annotations.ApiModelProperty;
import io.swagger.models.auth.In;
import lombok.Data;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
import java.math.BigDecimal;
import java.util.Date;
@@ -23,101 +25,118 @@
public class Goodsorder {
@ApiModelProperty(value = "缂栫爜")
- @ExcelColumn(name="缂栫爜")
+ @ExcelColumn(name="璁㈠崟缂栧彿",index = 2,width = 10,align = HorizontalAlignment.CENTER)
private String id;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿")
//@JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鍒涘缓浜�")
- @ExcelColumn(name="鍒涘缓浜�")
private String creator;
@ApiModelProperty(value = "缂栬緫鏃堕棿")
- @ExcelColumn(name="缂栬緫鏃堕棿")
//@JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "缂栬緫浜�")
- @ExcelColumn(name="缂栬緫浜�")
private String editor;
@ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�", example = "1")
- @ExcelColumn(name="鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�")
+ @TableLogic(value = "0",delval ="1")
private Integer isdeleted;
@ApiModelProperty(value = "澶囨敞")
- @ExcelColumn(name="澶囨敞")
private String info;
@ApiModelProperty(value = "璁㈠崟缂栫爜")
- @ExcelColumn(name="璁㈠崟缂栫爜")
private String code;
@ApiModelProperty(value = "鐢ㄦ埛缂栫爜锛堝叧鑱攎ember琛級")
- @ExcelColumn(name="鐢ㄦ埛缂栫爜锛堝叧鑱攎ember琛級")
private String memberId;
@ApiModelProperty(value = "鐢ㄦ埛缂栫爜锛堝叧鑱攎ember琛級")
- @ExcelColumn(name="鐢ㄦ埛鍚嶇О锛堝叧鑱攎ember琛級")
@TableField(exist = false)
private String memberName;
@ApiModelProperty(value = "浜ゆ槗閲戦")
- @ExcelColumn(name="浜ゆ槗閲戦")
+ @ExcelColumn(name="鎶奸噾锛堝厓锛�",index = 4,width = 10,align = HorizontalAlignment.CENTER)
private BigDecimal money;
@ApiModelProperty(value = "鐘舵�� 0寰呮敮浠� 1宸叉敮浠� 2宸插彇娑� 3鏀粯澶辫触 4宸茬粨绠�")
- @ExcelColumn(name="鐘舵�� 0寰呮敮浠� 1宸叉敮浠� 2宸插彇娑� 3鏀粯澶辫触 4宸茬粨绠�")
private Integer status;
@ApiModelProperty(value = "浜ゆ槗棰勮鍗曞彿")
- @ExcelColumn(name="浜ゆ槗棰勮鍗曞彿")
private String preOrderid;
@ApiModelProperty(value = "鍦ㄧ嚎浜ゆ槗鍗曞彿")
- @ExcelColumn(name="鍦ㄧ嚎浜ゆ槗鍗曞彿")
+ @ExcelColumn(name="浜ゆ槗鍗曞彿",index = 3,width = 10,align = HorizontalAlignment.CENTER)
private String onlineOrderid;
-
@ApiModelProperty(value = "鏀粯鐘舵�� 0寰呮敮浠� 1宸叉敮浠�")
- @ExcelColumn(name="鏀粯鐘舵�� 0寰呮敮浠� 1宸叉敮浠�")
private Integer payStatus;
@ApiModelProperty(value = "鏀粯鏂瑰紡 0寰俊 1鏀粯瀹�")
- @ExcelColumn(name="鏀粯鏂瑰紡 0寰俊 1鏀粯瀹�")
- private String payWay;
+ private Integer payWay;
@ApiModelProperty(value = "鏀粯鏃堕棿")
- @ExcelColumn(name="鏀粯鏃堕棿")
+ @ExcelColumn(name="浜ゆ娂閲戞椂闂�",index = 5,width = 10,align = HorizontalAlignment.CENTER,dateFormat = "yyyy-MM-dd HH:mm:ss" )
private Date payDate;
@ApiModelProperty(value = "浜ゆ槗绫诲瀷 0绉熻溅鎶奸噾")
- @ExcelColumn(name="浜ゆ槗绫诲瀷 0绉熻溅鎶奸噾")
private Integer type;
@ApiModelProperty(value = "缁撶畻閲戦(鍒嗭級")
- @ExcelColumn(name="缁撶畻閲戦(鍒嗭級")
+ @ExcelColumn(name="缁撶畻閲戦(鍏�)",index = 7,width = 10,align = HorizontalAlignment.CENTER)
private BigDecimal closeMoney;
@ApiModelProperty(value = "缁撶畻閫�娆惧崟鍙�(鍏宠仈refund)")
- @ExcelColumn(name="缁撶畻閫�娆惧崟鍙�(鍏宠仈refund)")
private String closeId;
@ApiModelProperty(value = "缁撶畻鏃堕棿")
- @ExcelColumn(name="缁撶畻鏃堕棿")
+ @ExcelColumn(name="缁撶畻鏃堕棿",index = 8,width = 10,align = HorizontalAlignment.CENTER,dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date closeDate;
-
@ApiModelProperty(value = "缁撶畻澶囨敞")
- @ExcelColumn(name="缁撶畻澶囨敞")
private String closeInfo;
@ApiModelProperty(value = "缁撶畻鎿嶄綔浜虹紪鐮侊紙鍏宠仈system_user)")
- @ExcelColumn(name="缁撶畻鎿嶄綔浜虹紪鐮侊紙鍏宠仈system_user)")
private String closeUserId;
- @ApiModelProperty(value = "缁撶畻绫诲瀷 0鑷姩缁撶畻 1骞冲彴浜哄伐缁撶畻 2绯荤粺鑷姩缁撶畻")
- @ExcelColumn(name="缁撶畻绫诲瀷 0鑷姩缁撶畻 1骞冲彴浜哄伐缁撶畻 2绯荤粺鑷姩缁撶畻")
+ @ApiModelProperty(value = "缁撶畻绫诲瀷 0鐢ㄦ埛鑷缁撶畻 1骞冲彴浜哄伐寮哄埗缁撶畻 2绯荤粺鑷姩缁撶畻")
private Integer closeType;
+
+ @ApiModelProperty(value = "鐢ㄦ埛openid" )
+ @TableField(exist = false)
+ @ExcelColumn(name="鐢ㄦ埛",index = 1 ,width = 10,align = HorizontalAlignment.CENTER)
+ private String openid;
+
+ @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;
+ @ApiModelProperty(value = "浜ゆ槗绗旀暟", example = "0")
+ @TableField(exist = false)
+ private int countNum;
+
+ @ApiModelProperty(value = "閫�娆炬�婚(鍒嗭級")
+ @TableField(exist = false)
+ @ExcelColumn(name="閫�鎶奸噾(鍏�)",index = 6,width = 10,align = HorizontalAlignment.CENTER)
+ private BigDecimal refundMoney;
+
+ @ApiModelProperty(value = "鏈�鍚庨��娆炬椂闂�")
+ @TableField(exist = false)
+ @ExcelColumn(name="閫�娆剧粨绠楁椂闂�",index = 9,width = 10,align = HorizontalAlignment.CENTER,dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date refundDate;
+
+ @ApiModelProperty(value = "鏈�杩戦獞琛岀姸鎬�")
+ @TableField(exist = false)
+ private Integer memberRidesStatus;
+
+
+ @ApiModelProperty(value = "鏄惁缁撶畻 0 鏈粨绠� 1宸茬粨绠�")
+ @TableField(exist = false)
+ private Integer closeStatus;
}
--
Gitblit v1.9.3