productDev/parkBike.git

			@@ -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,131 @@
			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 = "用户编码（关联member表）")
			@ExcelColumn(name="用户编码（关联member表）")
			private String memberId;

			@ApiModelProperty(value = "关联对象编码")
			private String objId;
			@ApiModelProperty(value = "关联对象类型 0套餐卡")
			private Integer objType;
			@ApiModelProperty(value = "交易类型 0租车押金 1套餐卡购买")
			private Integer type;
			@ApiModelProperty(value = "用户编码（关联member表）")
			@ExcelColumn(name="用户名称（关联member表）")
			@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 = "结算车型编码")
			private String paramId;
			@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 = "骑行卡抵扣(分）")
			@ExcelColumn(name="优惠金额",index = 10,width = 10,align = HorizontalAlignment.CENTER)
			@TableField(exist = false)
			private BigDecimal discountMoney;
			@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;

			@ApiModelProperty(value = "操作人")
			@TableField(exist = false)
			private String refundUserName;

			@ApiModelProperty(value = "套餐名称", example = "2023-10-01 15:12:01")
			@TableField(exist = false)
			private String discountName;

			@ApiModelProperty(value = "骑行类型")
			@ExcelColumn(name="订单类型",index = 11,width = 10,valueMapping = "3=单车类型;4=电车类型;",align = HorizontalAlignment.CENTER)
			@TableField(exist = false)
			private Integer bikeType;

			}