Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike int...

jiangping

2023-10-26 687d0fc2de844e09864cc2ea2b24550069a50546

 server/services/src/main/java/com/doumee/dao/business/model/Goodsorder.java

@@ -25,7 +25,7 @@
public class Goodsorder {

    @ApiModelProperty(value = "编码")
    @ExcelColumn(name="订单编号",width = 10,align = HorizontalAlignment.CENTER)
    @ExcelColumn(name="订单编号",index = 2,width = 10,align = HorizontalAlignment.CENTER)
    private String id;

    @ApiModelProperty(value = "创建时间")
@@ -61,7 +61,7 @@
    private String memberName;

    @ApiModelProperty(value = "交易金额")
    @ExcelColumn(name="押金（元）",width = 10,align = HorizontalAlignment.CENTER)
    @ExcelColumn(name="押金（元）",index = 4,width = 10,align = HorizontalAlignment.CENTER)
    private BigDecimal money;

    @ApiModelProperty(value = "状态 0待支付 1已支付 2已取消 3支付失败 4已结算")
@@ -71,7 +71,7 @@
    private String preOrderid;

    @ApiModelProperty(value = "在线交易单号")
    @ExcelColumn(name="交易单号",width = 10,align = HorizontalAlignment.CENTER)
    @ExcelColumn(name="交易单号",index = 3,width = 10,align = HorizontalAlignment.CENTER)
    private String onlineOrderid;
    @ApiModelProperty(value = "支付状态 0待支付 1已支付")
    private Integer payStatus;
@@ -80,21 +80,21 @@
    private Integer payWay;

    @ApiModelProperty(value = "支付时间")
    @ExcelColumn(name="交押金时间",width = 10,align = HorizontalAlignment.CENTER)
    @ExcelColumn(name="交押金时间",index = 5,width = 10,align = HorizontalAlignment.CENTER)
    private Date payDate;

    @ApiModelProperty(value = "交易类型 0租车押金")
    private Integer type;

    @ApiModelProperty(value = "结算金额(分）")
    @ExcelColumn(name="结算金额",width = 10,align = HorizontalAlignment.CENTER)
    @ExcelColumn(name="结算金额(元)",index = 7,width = 10,align = HorizontalAlignment.CENTER)
    private BigDecimal closeMoney;

    @ApiModelProperty(value = "结算退款单号(关联refund)")
    private String closeId;

    @ApiModelProperty(value = "结算时间")
//    @ExcelColumn(name="退款结算时间",width = 10,align = HorizontalAlignment.CENTER)
    @ExcelColumn(name="结算时间",index = 8,width = 10,align = HorizontalAlignment.CENTER)
    private Date closeDate;
    @ApiModelProperty(value = "结算备注")
    private String closeInfo;
@@ -107,7 +107,9 @@

    @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")
@@ -119,14 +121,15 @@
    @ApiModelProperty(value = "交易笔数", example = "0")
    @TableField(exist = false)
    private int countNum;

    @ApiModelProperty(value = "退款总额(分）")
    @TableField(exist = false)
    @ExcelColumn(name="退款总额（元）",width = 10,align = HorizontalAlignment.CENTER)
    @ExcelColumn(name="退押金(元)",index = 6,width = 10,align = HorizontalAlignment.CENTER)
    private BigDecimal refundMoney;

    @ApiModelProperty(value = "最后退款时间")
    @TableField(exist = false)
    @ExcelColumn(name="退款结算时间",width = 10,align = HorizontalAlignment.CENTER)
    @ExcelColumn(name="退款结算时间",index = 9,width = 10,align = HorizontalAlignment.CENTER)
    private Date refundDate;

    @ApiModelProperty(value = "最近骑行状态")