java/qijisheng.git

			@@ -2,7 +2,6 @@

			import com.baomidou.mybatisplus.annotation.TableField;
			import com.baomidou.mybatisplus.annotation.TableId;
			import com.baomidou.mybatisplus.annotation.TableLogic;
			import com.baomidou.mybatisplus.annotation.TableName;
			import io.swagger.annotations.ApiModel;
			import io.swagger.annotations.ApiModelProperty;
			@@ -40,9 +39,13 @@
			@TableField("order_type")
			private Integer orderType;

			@ApiModelProperty(value = "1待发货2待收货3待使用4已完成5已取消6已退款7售后中")
			@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")
			@@ -51,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")
			@@ -96,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;
			@@ -103,7 +114,6 @@
			@ApiModelProperty(value = "优惠总金额")
			@TableField("discount_total_amount")
			private BigDecimal discountTotalAmount;


			@ApiModelProperty(value = "实际支付价格")
			@TableField("payment_amount")
			@@ -113,7 +123,7 @@
			@TableField("point")
			private Integer point;

			@ApiModelProperty(value = "1wx2积分")
			@ApiModelProperty(value = "1微信，2账户余额，3积分")
			@TableField("pay_method")
			private Integer payMethod;

			@@ -128,10 +138,46 @@
			@ApiModelProperty(value = "运费")
			@TableField("express_amount")
			private BigDecimal expressAmount;

			@ApiModelProperty(value = "1微信，2账户余额")
			@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")
			@@ -159,7 +205,6 @@

			@ApiModelProperty(value = "删除标志（0=否，1=是）")
			@TableField("del_flag")
			@TableLogic
			private Integer delFlag;

			@ApiModelProperty(value = "添加时间")
			@@ -169,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;


			}