java/JiaDianHuiShou.git

			@@ -35,6 +35,12 @@
			@TableField("city")
			private String city;

			@TableField("province_code")
			private String provinceCode;

			@TableField("area_code")
			private String areaCode;

			@ApiModelProperty("订单编号")
			@TableField("order_number")
			private String orderNumber;
			@@ -43,6 +49,11 @@
			@TableField("user_id")
			private Integer userId;


			@ApiModelProperty("下单用户id")
			@TableField("print_count")
			private Integer printCount;

			@ApiModelProperty("站点id")
			@TableField("site_id")
			private Integer siteId;
			@@ -50,7 +61,9 @@
			@ApiModelProperty("站点名称")
			@TableField("site_name")
			private String siteName;

			@ApiModelProperty("拉起确认收款页面参数")
			@TableField("package_info")
			private String packageInfo;
			@ApiModelProperty("回收服务id")
			@TableField("serve_id")
			private Integer serveId;
			@@ -104,7 +117,7 @@
			@TableField("reservation_remark")
			private String reservationRemark;

			@ApiModelProperty("订单状态(0:待派单；1:待上门；2:待完工；3:已完结；4:已取消；5:已改派，6:待改派)")
			@ApiModelProperty("订单状态(0:待派单；1:待上门；2:待完工；3:已完结；4:已取消；5:已改派，6:待改派，7：待预约)")
			@TableField("state")
			private Integer state;

			@@ -134,7 +147,7 @@
			@TableField("subsidy")
			private BigDecimal subsidy;

			@ApiModelProperty("是否已提现(0:未提现，1:已提现)")
			@ApiModelProperty("是否已提现(0:未提现，1:审核中 2审核通过 3:已确认收款)")
			@TableField("is_withdrawal")
			private Integer isWithdrawal;

			@@ -166,8 +179,39 @@
			@TableField(exist = false)
			private String applyReason;

			@ApiModelProperty("代派单")
			@TableField(exist = false)
			private Integer toBeDispatched=0;
			@ApiModelProperty("待上门")
			@TableField(exist = false)
			private Integer stayDoorstep=0;
			@ApiModelProperty("带完工")
			@TableField(exist = false)
			private Integer toBeCompleted=0;
			@ApiModelProperty("已完结")
			@TableField(exist = false)
			private Integer completed=0;
			@ApiModelProperty("已取消")
			@TableField(exist = false)
			private Integer canceled =0;
			@ApiModelProperty("再投数量")
			@TableField(exist = false)
			private Integer reInvestment=0;
			@ApiModelProperty("待预约数量")
			@TableField(exist = false)
			private Integer pending=0;

			@ApiModelProperty("是否为再投单")
			@TableField("is_reinvest")
			private Integer isReinvest;


			@ApiModelProperty("1虚假订单0正常订单")
			@TableField("fake")
			private Integer fake;

			@ApiModelProperty("短信发送次数")
			@TableField("msg_count")
			private Integer msgCount;

			}