|
@@ -46,13 +46,13 @@ public class UserReservationOrder {
|
|
|
@TableField("order_status")
|
|
@TableField("order_status")
|
|
|
private Integer orderStatus;
|
|
private Integer orderStatus;
|
|
|
|
|
|
|
|
- @ApiModelProperty(value = "支付状态 0:未支付 1:已支付 2:已退款 3:部分退款")
|
|
|
|
|
- @TableField("payment_status")
|
|
|
|
|
- private Integer paymentStatus;
|
|
|
|
|
|
|
+ @ApiModelProperty(value = "订单费用类型 0-免费,1-收费")
|
|
|
|
|
+ @TableField("order_cost_type")
|
|
|
|
|
+ private Integer orderCostType;
|
|
|
|
|
|
|
|
@ApiModelProperty(value = "订单/预订金额(元)")
|
|
@ApiModelProperty(value = "订单/预订金额(元)")
|
|
|
@TableField("total_amount")
|
|
@TableField("total_amount")
|
|
|
- private BigDecimal totalAmount;
|
|
|
|
|
|
|
+ private Integer totalAmount;
|
|
|
|
|
|
|
|
@ApiModelProperty(value = "订金金额(元),0表示免费预订")
|
|
@ApiModelProperty(value = "订金金额(元),0表示免费预订")
|
|
|
@TableField("deposit_amount")
|
|
@TableField("deposit_amount")
|