server/services/src/main/java/com/doumee/dao/business/model/Bikes.java
@@ -124,4 +124,5 @@ @ExcelColumn(name="最近定位地址") private String location; } server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java
@@ -54,7 +54,16 @@ @ApiModelProperty(value = "车辆编码") @ExcelColumn(name="车辆编码",index = 2,width = 10,align = HorizontalAlignment.CENTER) private String bikeCode; @ApiModelProperty(value = "套餐卡抵扣时长(分钟)") @ExcelColumn(name="套餐卡抵扣时长(分钟)",index = 12, align = HorizontalAlignment.CENTER) private String discountTime; @ApiModelProperty(value = "套餐卡编码(关联discount_member_id)") private String discountMemberId; @ApiModelProperty(value = "套餐抵扣价格(元)") @ExcelColumn(name="套餐抵扣价格(元)",index = 13, align = HorizontalAlignment.CENTER) private BigDecimal discountPrice; @ApiModelProperty(value = "临时停车开始时间") private Date pauseDate; @ApiModelProperty(value = "当前账户余额") private BigDecimal balance; @@ -123,7 +132,7 @@ @ApiModelProperty(value = "结算状态 0未结算 1已结束") private Integer closeStatus; @ApiModelProperty(value = "状态 0请求开锁中 1骑行中 2已还车 3开锁失败") @ApiModelProperty(value = "状态 0请求开锁中 1骑行中 2已还车 3开锁失败 4临时锁车") private Integer status; @ApiModelProperty(value = "关联订单编码(关联goodsorder)") private String ordreId; server/services/src/main/java/com/doumee/dao/business/model/Refund.java
@@ -82,14 +82,16 @@ @ApiModelProperty(value = "退款方式 0微信 1支付宝", example = "1") @ExcelColumn(name="退款方式 0微信 1支付宝") private Integer payWay; @ApiModelProperty(value = "套餐卡退款类型 0退货退款 1仅退款") @ExcelColumn(name="套餐卡退款类型 0退货退款 1仅退款") private String discountType; @ApiModelProperty(value = "完成时间") @ExcelColumn(name="完成时间") //@JsonFormat(pattern = "yyyy-MM-dd") private Date doneDate; @ApiModelProperty(value = "退款类型 0用户结算退款 1平台自动结算退款 2强制结算退款 3结算后退款'", example = "1") @ExcelColumn(name="退款类型 0用户结算退款 1平台自动结算退款 2强制结算退款 3结算后退款'") @ApiModelProperty(value = "退款类型 0用户结算退款 1平台自动结算退款 2强制结算退款 3结算后退款 4套餐卡退款'", example = "1") @ExcelColumn(name="退款类型 0用户结算退款 1平台自动结算退款 2强制结算退款 4套餐卡退款'") private Integer type; @ApiModelProperty(value = "退款类型 0结算退款 1强制结算退款 2结算后退款", example = "1") @TableField(exist = false) @@ -114,6 +116,7 @@ private String payOnlineOrderid; @ApiModelProperty(value = "交易笔数", example = "0") @TableField(exist = false) private int countNum; server/services/src/main/java/com/doumee/dao/business/model/Sites.java
@@ -100,4 +100,7 @@ @ApiModelProperty(value = "图片base64") @TableField(exist = false) private String base64; @ApiModelProperty(value = "电子围栏经纬度集合 jsonb") @TableField(exist = false) private String electronicFence; }