修改启动异常

puzhibing

2024-12-04 0e192c3c48b374bcc0986942f857a77de58ec043

 ruoyi-api/ruoyi-api-order/src/main/java/model/Order.java

@@ -44,9 +44,17 @@
    @TableField("order_status")
    private Integer orderStatus;

    @ApiModelProperty(value = "是否已分佣: 0-否 1-是")
    @TableField("is_commission")
    private Integer isCommission;

    @ApiModelProperty(value = "核销时间")
    @TableField("end_time")
    private LocalDateTime endTime;

    @ApiModelProperty(value = "售后截止日期")
    @TableField("after_sale_time")
    private LocalDateTime afterSaleTime;

    @ApiModelProperty(value = "技师id")
    @TableField("technician_id")
@@ -72,13 +80,38 @@
    @TableField("total_amount")
    private BigDecimal totalAmount;

    @ApiModelProperty(value = "满减金额")
    @TableField("full_reduction_amount")
    private BigDecimal fullReductionAmount;

    @ApiModelProperty(value = "代金券抵扣金额")
    @TableField("money_amount")
    private BigDecimal moneyAmount;

    @ApiModelProperty(value = "折扣券抵扣金额")
    @TableField("discount_amount")
    private BigDecimal discountAmount;

    @ApiModelProperty(value = "商品券抵扣总金额")
    @TableField("good_amount")
    private BigDecimal goodAmount;

    @ApiModelProperty(value = "活动优惠金额")
    @TableField("activity_amount")
    private BigDecimal activityAmount;

    @ApiModelProperty(value = "优惠总金额")
    @TableField("discount_total_amount")
    private BigDecimal discountTotalAmount;


    @ApiModelProperty(value = "实际支付价格")
    @TableField("payment_amount")
    private BigDecimal paymentAmount;

    @ApiModelProperty(value = "使用积分")
    @TableField("point")
    private BigDecimal point;
    private Integer point;

    @ApiModelProperty(value = "1wx2积分")
    @TableField("pay_method")
@@ -87,6 +120,10 @@
    @ApiModelProperty(value = "使用的优惠劵json")
    @TableField("coupon_json")
    private String couponJson;

    @ApiModelProperty(value = "订单优惠活动的json快照")
    @TableField("activity_json")
    private String activityJson;

    @ApiModelProperty(value = "运费")
    @TableField("express_amount")
@@ -106,7 +143,7 @@

    @ApiModelProperty(value = "本单获取的积分")
    @TableField("get_point")
    private BigDecimal getPoint;
    private Integer getPoint;

    @ApiModelProperty(value = "微信支付号")
    @TableField("serial_number")