productDev/parkBike.git

			@@ -1,16 +1,14 @@
			package com.doumee.dao.business.model;

			import com.baomidou.mybatisplus.annotation.TableLogic;
			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;

			/**
			* 退款信息表
			@@ -61,6 +59,10 @@
			@ExcelColumn(name="用户编码（关联member表）")
			private String memberId;

			@ApiModelProperty(value = "可退金额", example = "1")
			@ExcelColumn(name="可退回押金（元）" )
			private BigDecimal canBalance;

			@ApiModelProperty(value = "交易金额", example = "1")
			@ExcelColumn(name="交易金额")
			private BigDecimal money;
			@@ -86,9 +88,12 @@
			//@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="退款关联订单编码")
			@@ -97,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;


			}