From f9691d544e62d6c04dbfe45d05a6c7bc5e004291 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期五, 29 十二月 2023 11:52:29 +0800 Subject: [PATCH] 服务商 --- server/services/src/main/java/com/doumee/dao/business/model/WxBill.java | 43 +++++++++++++++++++++++++++++-------------- 1 files changed, 29 insertions(+), 14 deletions(-) diff --git a/server/services/src/main/java/com/doumee/dao/business/model/WxBill.java b/server/services/src/main/java/com/doumee/dao/business/model/WxBill.java index 4114441..e3385c6 100644 --- a/server/services/src/main/java/com/doumee/dao/business/model/WxBill.java +++ b/server/services/src/main/java/com/doumee/dao/business/model/WxBill.java @@ -1,6 +1,8 @@ package com.doumee.dao.business.model; +import com.baomidou.mybatisplus.annotation.TableField; import com.doumee.core.annotation.excel.ExcelColumn; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import com.baomidou.mybatisplus.annotation.IdType; @@ -8,6 +10,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.math.BigDecimal; +import java.util.Date; /** * @@ -20,43 +23,43 @@ public class WxBill { @ApiModelProperty(value = "") - @ExcelColumn(name="") + @ExcelColumn(name="涓婚敭锛屾寜鐓ф棩鏈焬yyyMMDD鏍煎紡瀛樺偍锛岄槻姝㈤噸澶�") private String id; @ApiModelProperty(value = "鎬讳氦鏄撳崟鏁�", example = "1") - @ExcelColumn(name="鎬讳氦鏄撳崟鏁�") + @ExcelColumn(name="鏀舵浜ゆ槗鍗曟暟") private Integer sumBill; - @ApiModelProperty(value = "閫�娆剧殑璁㈠崟鏁�", example = "1") - @ExcelColumn(name="閫�娆剧殑璁㈠崟鏁�") + @ApiModelProperty(value = "閫�娆剧瑪鏁�", example = "1") + @ExcelColumn(name="閫�娆剧瑪鏁�") private Integer sumRefundBill; - @ApiModelProperty(value = "搴旂粨璁㈠崟鎬婚噾棰�", example = "1") - @ExcelColumn(name="搴旂粨璁㈠崟鎬婚噾棰�") + @ApiModelProperty(value = "搴旂粨璁㈠崟鎬婚噾棰濓紙浜ゆ槗閲戦锛�", example = "1") + @ExcelColumn(name="浜ゆ槗閲戦") private BigDecimal sumSuccessFee; - @ApiModelProperty(value = "閫�娆炬�婚噾棰�", example = "1") - @ExcelColumn(name="閫�娆炬�婚噾棰�") + @ApiModelProperty(value = "閫�娆鹃噾棰�", example = "1") + @ExcelColumn(name="閫�娆鹃噾棰�") private BigDecimal sumRefundFee; @ApiModelProperty(value = "鍏呭�煎埜閫�娆炬�婚噾棰�", example = "1") @ExcelColumn(name="鍏呭�煎埜閫�娆炬�婚噾棰�") private BigDecimal sumCouponRefundFee; - @ApiModelProperty(value = "鎵嬬画璐规�婚噾棰�", example = "1") - @ExcelColumn(name="鎵嬬画璐规�婚噾棰�") + @ApiModelProperty(value = "鏀舵鎵嬬画璐规�婚噾棰�", example = "1") + @ExcelColumn(name="鏀舵鎵嬬画璐规�婚噾棰�") private BigDecimal sumCmmsAmt; @ApiModelProperty(value = "璁㈠崟鎬婚噾棰�", example = "1") @ExcelColumn(name="璁㈠崟鎬婚噾棰�") private BigDecimal sumTotalFee; - @ApiModelProperty(value = "鐢宠閫�娆炬�婚噾棰�", example = "1") - @ExcelColumn(name="鐢宠閫�娆炬�婚噾棰�") + @ApiModelProperty(value = "鐢宠閫�娆鹃噾棰�", example = "1") + @ExcelColumn(name="鐢宠閫�娆鹃噾棰�") private BigDecimal sumApplyRefundFee; - @ApiModelProperty(value = "閫�娆炬墜缁垂鎬婚噾棰�", example = "1") - @ExcelColumn(name="閫�娆炬墜缁垂鎬婚噾棰�") + @ApiModelProperty(value = "閫�娆炬墜缁垂", example = "1") + @ExcelColumn(name="閫�娆炬墜缁垂") private BigDecimal sumRefundCmmsAmt; @ApiModelProperty(value = "缁撶畻閲戦", example = "1") @@ -66,5 +69,17 @@ @ApiModelProperty(value = "鑷杞︽敹鍏�", example = "1") @ExcelColumn(name="鑷杞︽敹鍏�") private BigDecimal bikeFee; + @ApiModelProperty(value = "鍚屾寰俊璐﹀崟鏃ユ湡", example = "2023-10-08") + @TableField(exist = false) + @JsonFormat(pattern = "yyyy-MM-dd") + private Date createDate; + @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; } -- Gitblit v1.9.3