From 47f0aa8aeda7a5a6984b04888c40b5cf86e33c8e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 10 十月 2023 16:08:29 +0800
Subject: [PATCH] 骑行时长减免和强制还车
---
server/services/src/main/java/com/doumee/dao/business/model/WxBillDetail.java | 60 ++++++++++++++++++++++++------------------------------------
1 files changed, 24 insertions(+), 36 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/WxBillDetail.java b/server/services/src/main/java/com/doumee/dao/business/model/WxBillDetail.java
index 84215f0..5c8d7c5 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/WxBillDetail.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/WxBillDetail.java
@@ -1,13 +1,14 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
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 org.apache.poi.ss.usermodel.HorizontalAlignment;
+
import java.util.Date;
import java.math.BigDecimal;
@@ -22,130 +23,117 @@
public class WxBillDetail {
@ApiModelProperty(value = "")
- @ExcelColumn(name="")
private String id;
@ApiModelProperty(value = "瀵硅处鍗旾D")
- @ExcelColumn(name="瀵硅处鍗旾D")
private String pid;
@ApiModelProperty(value = "浜ゆ槗鏃堕棿")
- @ExcelColumn(name="浜ゆ槗鏃堕棿")
+ @ExcelColumn(name="浜ゆ槗鏃堕棿",width = 10,align = HorizontalAlignment.CENTER)
//@JsonFormat(pattern = "yyyy-MM-dd")
private Date billDate;
@ApiModelProperty(value = "鍏紬璐﹀彿ID")
- @ExcelColumn(name="鍏紬璐﹀彿ID")
private String appid;
@ApiModelProperty(value = "鍟嗘埛鍙�")
- @ExcelColumn(name="鍟嗘埛鍙�")
private String mchId;
@ApiModelProperty(value = "鐗圭害鍟嗘埛鍙�")
- @ExcelColumn(name="鐗圭害鍟嗘埛鍙�")
private String subMchid;
@ApiModelProperty(value = "璁惧鍙�")
- @ExcelColumn(name="璁惧鍙�")
private String deviceInfo;
- @ApiModelProperty(value = "寰俊璁㈠崟鍙�")
- @ExcelColumn(name="寰俊璁㈠崟鍙�")
+ @ApiModelProperty(value = "寰俊浜ゆ槗鍙�")
+ @ExcelColumn(name="寰俊浜ゆ槗鍙�",width = 10,align = HorizontalAlignment.CENTER)
private String transactionId;
@ApiModelProperty(value = "鍟嗘埛璁㈠崟鍙�")
- @ExcelColumn(name="鍟嗘埛璁㈠崟鍙�")
+ @ExcelColumn(name="璁㈠崟缂栧彿",width = 10,align = HorizontalAlignment.CENTER)
private String outTradeNo;
@ApiModelProperty(value = "鐢ㄦ埛鏍囪瘑")
- @ExcelColumn(name="鐢ㄦ埛鏍囪瘑")
+ @ExcelColumn(name="鐢ㄦ埛",width = 10,align = HorizontalAlignment.CENTER)
private String openid;
@ApiModelProperty(value = "浜ゆ槗绫诲瀷")
- @ExcelColumn(name="浜ゆ槗绫诲瀷")
private String billType;
@ApiModelProperty(value = "浜ゆ槗鐘舵��")
- @ExcelColumn(name="浜ゆ槗鐘舵��")
private String billStatus;
@ApiModelProperty(value = "浠樻閾惰")
- @ExcelColumn(name="浠樻閾惰")
private String bankType;
@ApiModelProperty(value = "璐у竵绉嶇被")
- @ExcelColumn(name="璐у竵绉嶇被")
private String feeType;
@ApiModelProperty(value = "搴旂粨璁㈠崟閲戦", example = "1")
- @ExcelColumn(name="搴旂粨璁㈠崟閲戦")
+ @ExcelColumn(name="浜ゆ槗閲戦",width = 10,align = HorizontalAlignment.CENTER)
private BigDecimal settlementTotalFee;
@ApiModelProperty(value = "浠ｉ噾鍒搁噾棰�", example = "1")
- @ExcelColumn(name="浠ｉ噾鍒搁噾棰�")
private BigDecimal couponFee;
@ApiModelProperty(value = "寰俊閫�娆惧崟鍙�")
- @ExcelColumn(name="寰俊閫�娆惧崟鍙�")
private String refundId;
@ApiModelProperty(value = "鍟嗘埛閫�娆惧崟鍙�")
- @ExcelColumn(name="鍟嗘埛閫�娆惧崟鍙�")
private String outRefundNo;
@ApiModelProperty(value = "閫�娆鹃噾棰�", example = "1")
- @ExcelColumn(name="閫�娆鹃噾棰�")
private BigDecimal refundFee;
@ApiModelProperty(value = "鍏呭�煎埜閫�娆鹃噾棰�", example = "1")
- @ExcelColumn(name="鍏呭�煎埜閫�娆鹃噾棰�")
private BigDecimal couponRefundFee;
@ApiModelProperty(value = "閫�娆剧被鍨�")
- @ExcelColumn(name="閫�娆剧被鍨�")
private String refundType;
@ApiModelProperty(value = "閫�娆剧敵璇锋椂闂�")
- @ExcelColumn(name="閫�娆剧敵璇锋椂闂�")
- //@JsonFormat(pattern = "yyyy-MM-dd")
private Date refundApplyDate;
@ApiModelProperty(value = "閫�娆炬垚鍔熸椂闂�")
- @ExcelColumn(name="閫�娆炬垚鍔熸椂闂�")
- //@JsonFormat(pattern = "yyyy-MM-dd")
private Date refundSuccessDate;
@ApiModelProperty(value = "閫�娆剧姸鎬�")
- @ExcelColumn(name="閫�娆剧姸鎬�")
private String refundSuccessStatus;
@ApiModelProperty(value = "鍟嗗搧鍚嶇О")
- @ExcelColumn(name="鍟嗗搧鍚嶇О")
private String body;
@ApiModelProperty(value = "鍟嗘埛鏁版嵁鍖�")
- @ExcelColumn(name="鍟嗘埛鏁版嵁鍖�")
private String attach;
@ApiModelProperty(value = "鎵嬬画璐�", example = "1")
- @ExcelColumn(name="鎵嬬画璐�")
private BigDecimal cmmsAmt;
@ApiModelProperty(value = "璐圭巼", example = "1")
- @ExcelColumn(name="璐圭巼")
private BigDecimal rate;
@ApiModelProperty(value = "璁㈠崟閲戦", example = "1")
- @ExcelColumn(name="璁㈠崟閲戦")
private BigDecimal totalFee;
@ApiModelProperty(value = "鐢宠閫�娆鹃噾棰�", example = "1")
- @ExcelColumn(name="鐢宠閫�娆鹃噾棰�")
private BigDecimal applyRefundFee;
@ApiModelProperty(value = "璐圭巼澶囨敞")
- @ExcelColumn(name="璐圭巼澶囨敞")
private String rateRemark;
+ @ApiModelProperty(value = "鏌ヨ寮�濮嬫棩鏈燂紙鍖呭惈锛�", example = "20231008")
+ @TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:sss")
+ private Date startDate;
+ @ApiModelProperty(value = "鏌ヨ鎴鏃ユ湡锛堝寘鍚級", example = "20231008")
+ @TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:sss")
+ private Date endDate;
+ @ApiModelProperty(value = "鎬讳氦鏄撳崟鏁�", example = "1")
+ @TableField(exist = false)
+ private Integer sumBill;
+
+ @ApiModelProperty(value = "鏄惁闈炶嚜琛岃溅浜ゆ槗鏄庣粏 0鑷杞︿氦鏄� 1闈炶嚜琛岃溅浜ゆ槗,null琛ㄧず鎵�鏈�", example = "0")
+ @TableField(exist = false)
+ private Integer isBikeFee;
}
--
Gitblit v1.9.3