productDev/gtzxinglijicun.git

			@@ -57,8 +57,8 @@
			@ExcelColumn(name = "会员主键")
			private Integer memberId;

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

			@ApiModelProperty(value = "是否转换订单：0=否；1=是（异地转就地）", example = "0")
			@@ -80,6 +80,10 @@
			@ApiModelProperty(value = "关联主订单")
			@ExcelColumn(name = "关联主订单")
			private Integer relationOrderId;

			@TableField(exist = false)
			@ApiModelProperty(value = "关联订单号")
			private String relationOrderCode;

			@ApiModelProperty(value = "异常原因")
			@ExcelColumn(name = "异常原因")
			@@ -133,7 +137,7 @@
			@ApiModelProperty(value = "取件纬度")
			private BigDecimal takeLgt;

			@ApiModelProperty(value = "距离（异地存取使用）")
			@ApiModelProperty(value = "距离（同城寄送使用）")
			@ExcelColumn(name = "距离")
			private BigDecimal distance;

			@@ -213,7 +217,7 @@
			@ExcelColumn(name = "预估费用")
			private Long estimatedAmount;

			@ApiModelProperty(value = "基础费用/单价（分）")
			@ApiModelProperty(value = "基础费用-单价（分）")
			@ExcelColumn(name = "基础费用")
			private Long price;

			@@ -247,7 +251,7 @@
			@ExcelColumn(name = "基础寄存费用")
			private Long basicAmount;

			@ApiModelProperty(value = "订单总费用（分）")
			@ApiModelProperty(value = "订单总费用（分）",notes = "计入逾期费用与优惠券费用")
			@ExcelColumn(name = "订单总费用")
			private Long totalAmount;

			@@ -364,6 +368,21 @@
			@ApiModelProperty(value = "三方订单号")
			private String outTradeNo;

			@ApiModelProperty(value = "优惠券主键")
			private Integer couponId;

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

			@ApiModelProperty(value = "是否手动退款：0=否；1=是", example = "0")
			private Integer manualRefund;

			@ApiModelProperty(value = "发票状态：0=不可申请；1=可申请；2=申请中；3=开具成功；99=开具失败", example = "0")
			private Integer invoiceStatus;

			@ApiModelProperty(value = "门店异常补偿金额（分）")
			private Long shopCompensationAmount;

			@ApiModelProperty(value = "无人接单是否已短信通知平台：0=否；1=是", example = "0")
			private Integer platformSmsNotified;