productDev/gtzxinglijicun.git

			@@ -23,7 +23,7 @@
			@ApiModelProperty(value = "订单编号")
			private String code;

			@ApiModelProperty(value = "寄存方式:0=就地存取；1=异地存取")
			@ApiModelProperty(value = "寄存方式:0=就地寄存；1=同城寄送")
			private Integer type;

			@ApiModelProperty(value = "就地寄存状态：0=待支付;1=待寄存;2=已寄存;5=待取件;6=存在逾期;7=已完成;96:订单关闭（退款）;97:取消逾期;98=取消中;99=已取消;" +
			@@ -36,6 +36,9 @@
			@ApiModelProperty(value = "创建时间")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
			private Date createTime;

			@ApiModelProperty(value = "订单备注")
			private String remark;

			@ApiModelProperty(value = "预计取件时间")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
			@@ -58,6 +61,9 @@
			@ApiModelProperty(value = "存件门店联系电话")
			private String depositShopPhone;

			@ApiModelProperty(value = "存件门店地址")
			private String depositShopAddress;

			// ---- 取件信息 ----

			@ApiModelProperty(value = "取件门店主键（有取件门店时返回）")
			@@ -68,6 +74,9 @@

			@ApiModelProperty(value = "取件门店地址（有取件门店时返回）")
			private String takeShopAddress;

			@ApiModelProperty(value = "取件门店联系电话（有取件门店时返回）")
			private String takeShopPhone;

			@ApiModelProperty(value = "取件地点（无取件门店时返回，用户自选）")
			private String takeLocation;
			@@ -91,6 +100,9 @@

			// ---- 逾期 ----

			@ApiModelProperty(value = "逾期状态：0=未到店未逾期；1=未到店存在逾期；2=已到店未逾期；3=已到店待支付逾期；4=逾期已支付")
			private Integer overdueStatus;

			@ApiModelProperty(value = "是否逾期")
			private Boolean overdue;

			@@ -110,8 +122,33 @@
			@ApiModelProperty(value = "当前门店角色：1=存件门店；2=取件门店（仅门店端返回）")
			private Integer shopRole;

			// ---- 司机信息 ----

			@ApiModelProperty(value = "司机姓名（异地寄存有司机时返回）")
			private String driverName;

			@ApiModelProperty(value = "司机电话（异地寄存有司机时返回）")
			private String driverPhone;

			// ---- 评价 ----

			@ApiModelProperty(value = "评价状态：0=未评价；1=已评价")
			private Integer commentStatus;
			@ApiModelProperty(value = "序号")
			private String sortnum;
			@ApiModelProperty(value = "取货序号")
			private String sortnumTake;


			@ApiModelProperty(value = "下单照片")
			private List<String> orderImages;

			@ApiModelProperty(value = "可开票金额（分）= 支付金额 - 退款金额")
			private Long invoiceAmount;

			@ApiModelProperty(value = "优惠券抵扣金额（分）")
			private Long deductionAmount;

			@ApiModelProperty(value = "是否异常订单：0=否；1=是")
			private Integer abnormalOrder;
			}