定时任务延时任务

jiangqs

2023-07-12 f26537e926d7ad2d725e059700142ba14c0c2b1f

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerOrderPageVo.java

@@ -31,7 +31,7 @@
    @ApiModelProperty(value = "订单id")
    private String orderId;

    @ApiModelProperty("订单编号")
    @ApiModelProperty(value="订单编号")
    private String orderNo;

    @ApiModelProperty(value = "订单状态0.已取消1.待支付2.待核销3.已完成")
@@ -43,31 +43,31 @@
    @ApiModelProperty(value = "优惠券抵扣")
    private BigDecimal couponDiscount;

    @ApiModelProperty("应收金额")
    @ApiModelProperty(value="应收金额")
    private BigDecimal receivableMoney;

    @ApiModelProperty("应收订金")
    @ApiModelProperty(value="应收订金")
    private BigDecimal receivableDeposit;

    @ApiModelProperty("订单实际支付金额")
    @ApiModelProperty(value="订单实际支付金额")
    private BigDecimal payMoney;

    @ApiModelProperty("订单未支付金额")
    @ApiModelProperty(value="订单未支付金额")
    private BigDecimal unPaidMoney;

    @ApiModelProperty("订单备注")
    @ApiModelProperty(value="订单备注")
    private String orderRemark;

    @ApiModelProperty("创建时间")
    @ApiModelProperty(value="创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date createTime;

    @ApiModelProperty("订单来源")
    @ApiModelProperty(value="订单来源")
    private Integer orderFrom;

    @ApiModelProperty("订单来源")
    @ApiModelProperty(value="订单来源")
    private String orderFromDesc;

    @ApiModelProperty("订单商品列表")
    @ApiModelProperty(value="订单商品列表")
    private List<MerOrderGoodsPageVo> merOrderGoodsVoList;
}