Merge remote-tracking branch 'origin/master'

luodangjia

2025-01-15 257d66798aa538f8737980f13d94c547bf0b51ea

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

@@ -42,6 +42,10 @@
    @ApiModelProperty(value = "1待发货2待收货3待使用4已完成5已取消6已退款7售后中8已评价")
    @TableField("order_status")
    private Integer orderStatus;
    
    @ApiModelProperty(value = "1待发货2待收货3待使用4已完成5已取消6已退款7售后中8已评价")
    @TableField("old_order_status")
    private Integer oldOrderStatus;

    @ApiModelProperty(value = "是否已分佣: 0-否 1-是")
    @TableField("is_commission")
@@ -50,6 +54,10 @@
    @ApiModelProperty(value = "核销时间")
    @TableField("end_time")
    private LocalDateTime endTime;

    @ApiModelProperty(value = "核销人id")
    @TableField("canceller_app_user_id")
    private Long cancellerAppUserId;

    @ApiModelProperty(value = "售后截止日期")
    @TableField("after_sale_time")
@@ -95,6 +103,10 @@
    @TableField("good_amount")
    private BigDecimal goodAmount;

    @ApiModelProperty(value = "用户优惠券id")
    @TableField("user_coupon_id")
    private Long userCouponId;

    @ApiModelProperty(value = "活动优惠金额")
    @TableField("activity_amount")
    private BigDecimal activityAmount;
@@ -131,9 +143,41 @@
    @TableField("express_pay_method")
    private Integer expressPayMethod;

    @ApiModelProperty(value = "配送方式（1=自提，2=快递）")
    @TableField("distribution_mode")
    private Integer distributionMode;

    @ApiModelProperty(value = "第三方快递信息")
    @TableField("express_json")
    private String expressJson;

    @ApiModelProperty(value = "第三方快递结果")
    @TableField("express_result")
    private String expressResult;
    
    @ApiModelProperty(value = "发货省")
    @TableField("deliver_province")
    private String deliverProvince;
    
    @ApiModelProperty(value = "发货省编号")
    @TableField("deliver_province_code")
    private String deliverProvinceCode;
    
    @ApiModelProperty(value = "发货市")
    @TableField("deliver_city")
    private String deliverCity;
    
    @ApiModelProperty(value = "发货市编号")
    @TableField("deliver_city_code")
    private String deliverCityCode;
    
    @ApiModelProperty(value = "发货区")
    @TableField("deliver_district")
    private String deliverDistrict;
    
    @ApiModelProperty(value = "发货区编号")
    @TableField("deliver_district_code")
    private String deliverDistrictCode;

    @ApiModelProperty(value = "收货地址信息")
    @TableField("address_json")
@@ -170,6 +214,18 @@
    @ApiModelProperty(value = "预计提货时间")
    @TableField("expected_delivery_time")
    private String expectedDeliveryTime;

    @ApiModelProperty("退款状态（1=退款中，2=已退款）")
    @TableField("refund_status")
    private Integer refundStatus;

    @ApiModelProperty("退款流水号")
    @TableField("refund_code")
    private String refundCode;

    @ApiModelProperty("退款时间")
    @TableField("refund_time")
    private LocalDateTime refundTime;
    

}