修改

xuhy

2025-01-15 c27c1f2beb4ca89a94eaa854fce6b4553db8f2f8

 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")
@@ -139,6 +143,10 @@
    @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;
@@ -146,6 +154,30 @@
    @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")