productDev/jinkuai.git

			@@ -9,6 +9,7 @@
			import com.baomidou.mybatisplus.annotation.IdType;
			import com.baomidou.mybatisplus.annotation.TableId;
			import com.baomidou.mybatisplus.annotation.TableName;
			import io.swagger.v3.oas.annotations.media.Schema;
			import lombok.Data;
			import com.fasterxml.jackson.annotation.JsonFormat;
			import java.util.Date;
			@@ -25,6 +26,7 @@
			@TableName("`orders`")
			public class Orders {

			@TableId(type = IdType.AUTO)
			@ApiModelProperty(value = "主键", example = "1")
			private Integer id;

			@@ -55,9 +57,11 @@
			private Integer type;

			@ApiModelProperty(value = "开始时间 yyyy-MM-dd")
			@JsonFormat(pattern = "yyyy-MM-dd")
			private Date startDate;

			@ApiModelProperty(value = "结束时间 yyyy-MM-dd")
			@JsonFormat(pattern = "yyyy-MM-dd")
			private Date endDate;

			@ApiModelProperty(value = "地点信息/用车起点/用餐地点")
			@@ -87,20 +91,33 @@
			@ApiModelProperty(value = "用工类型:0=采摘工；1=分拣工；2=包装工；（用工订单）", example = "1")
			private Integer workType;

			@ApiModelProperty(value = "计价数量1(天数/用车次数/小时/斤数)", example = "1")
			@ApiModelProperty(value = "计价数量1((重量/人数/（天数/小时/重量）/（天数/次数）/用餐天数)", example = "1")
			private Integer priceNum1;

			@ApiModelProperty(value = "计价数量2(人数/用餐份数)", example = "1")
			@ApiModelProperty(value = "计价数量2(分拣工/包装工人数)", example = "1")
			private Integer priceNum2;

			@ApiModelProperty(value = "（发单方设置）计价数量1((重量/人数/（天数/小时/重量）/（天数/次数）/用餐天数)", example = "1")
			private Integer originPriceNum1;

			@ApiModelProperty(value = "（发单方设置）计价数量2(分拣工/包装工人数)", example = "1")
			private Integer originPriceNum2;

			@ApiModelProperty(value = "需求补充")
			private String supplement;

			@ApiModelProperty(value = "费用标准", example = "1")
			private Long price;
			private BigDecimal price;

			@ApiModelProperty(value = "预估费用", example = "1")
			private Long estimatedAccount;
			@ApiModelProperty(value = "接单方确认其他费用（分）", example = "1")
			private Long confirmOtherFee;
			@ApiModelProperty(value = "接单方确认费用备注", example = "1")
			private String confirmFeeRemark;

			@ApiModelProperty(value = "(发单方设置）预估费用", example = "1")
			private Long originEstimatedAccount;

			@ApiModelProperty(value = "实际支付费用", example = "1")
			private Long payAccount;
			@@ -136,8 +153,8 @@
			@ExcelColumn(name = "订单编号",index = 1,width = 10)
			private String code;

			@ApiModelProperty(value = "订单状态:0=待支付 1=待接单；2=已接单；3=进行中；4=已完成；99=已取消；", example = "1")
			@ExcelColumn(name = "订单状态",index = 11,width = 10,valueMapping = "0=待支付;1=待接单;2=已接单;3=进行中;4=已完成;99=已取消;")
			@ApiModelProperty(value = "订单状态:0=待支付 1=待接单；2=已接单；3=进行中；4=已完成；5=已确认金额；99=已取消；", example = "1")
			@ExcelColumn(name = "订单状态",index = 11,width = 10,valueMapping = "0=待支付;1=待接单;2=已接单;3=进行中;4=已完成;5=待支付;99=已取消;")
			private Integer status;

			@ApiModelProperty(value = "支付状态:0=待支付 1=已支付", example = "1")
			@@ -151,6 +168,7 @@
			private Integer acceptMemberId;

			@ApiModelProperty(value = "接单类型:0=手动接单；1=系统派单；", example = "1")
			@ExcelColumn(name = "接单方式",index = 14,width = 10,valueMapping = "0=手动接单;1=系统派单;")
			private Integer acceptType;

			@ApiModelProperty(value = "开始作业时间")
			@@ -188,7 +206,7 @@
			private Integer isUpdate;

			@ApiModelProperty(value = "修改时间", example = "1")
			private Integer isUpdateTime;
			private Date isUpdateTime;

			@ApiModelProperty(value = "接单方黑名单member:id 多个以,分割")
			private String blackReceive;
			@@ -199,6 +217,27 @@

			@ApiModelProperty(value = "取消类型：0=发单方无责取消；1=发单方有责取消；2=系统取消；", example = "1")
			private Integer cancelType;

			@ApiModelProperty(value = "支付方式：0=微信；1=其他", example = "1")
			private Integer payMethod;

			@ApiModelProperty(value = "支付时间", example = "1")
			private Date payTime;

			@ApiModelProperty(value = "联系人", example = "1")
			private String linkPhone;

			@ApiModelProperty(value = "联系方式", example = "1")
			private String linkName;

			@ApiModelProperty(value = "车辆规格", example = "1")
			private String carUnit;

			@ApiModelProperty(value = "三方支付订单号", example = "1")
			private String outTradeNo;

			@ApiModelProperty(value = "接单方确认金额时间")
			private Date confirmFeeTime;

			@ApiModelProperty(value = "图片")
			@TableField(exist = false)
			@@ -222,13 +261,22 @@
			@TableField(exist = false)
			private List<CateringDTO> cateringDTOList;

			@ApiModelProperty(value = "移动端用户", hidden = true)
			@ApiModelProperty(value = "移动端用户")
			@TableField(exist = false)
			private Member member;

			@ApiModelProperty(value = "查询我的订单：0=发单方订单；1=接单方订单；2=接单大厅；", example = "1")
			@TableField(exist = false)
			private Integer queryMyOrderType;

			@Schema(description ="修改确认倒计时")
			@TableField(exist = false)
			private Long confirmCountdown;


			@Schema(description ="自动取消倒计时")
			@TableField(exist = false)
			private Long cancelCountdown;


			@ApiModelProperty(value = "需求类型")
			@@ -277,6 +325,9 @@
			@TableField(exist = false)
			private Date createTimeEnd;

			@ApiModelProperty(value = "费用标准单位", example = "1")
			@TableField(exist = false)
			private String priceUnit;


			@ApiModelProperty(value = "接单时间起")
			@@ -288,6 +339,15 @@
			private Date acceptTimeEnd;


			@ApiModelProperty(hidden = true)
			@TableField(exist = false)
			@ExcelColumn(name = "预估金额（元）",index = 12,width = 10)
			private double estimatedAccountYuan;

			@ApiModelProperty(hidden = true)
			@TableField(exist = false)
			@ExcelColumn(name = "实付金额（元）",index = 13,width = 10)
			private double payAccountYuan;

			@ApiModelProperty(value = "完成时间起")
			@TableField(exist = false)
			@@ -297,5 +357,46 @@
			@TableField(exist = false)
			private Date doneTimeEnd;

			@ApiModelProperty(value = "排序方式：0=最新发布;1=距离优先;2=价格倒序", example = "1")
			@TableField(exist = false)
			private Integer sortType;

			@ApiModelProperty(value = "接单方评分")
			@TableField(exist = false)
			private double score;

			@ApiModelProperty(value = "接单量")
			@TableField(exist = false)
			private Long receiveNum;

			@ApiModelProperty(value = "发单量")
			@TableField(exist = false)
			private Long publishNum;

			@ApiModelProperty(value = "发单方头像")
			@TableField(exist = false)
			private String releaseCoverImage;

			@ApiModelProperty(value = "接单方头像")
			@TableField(exist = false)
			private String acceptCoverImage;

			@ApiModelProperty(value = "经度", example = "1")
			@TableField(exist = false)
			private BigDecimal queryLat;

			@ApiModelProperty(value = "纬度", example = "1")
			@TableField(exist = false)
			private BigDecimal queryLgt;

			@ApiModelProperty(value = "是否可取消：0=可以；1=不可以", example = "1")
			@TableField(exist = false)
			private Integer cancelStatus;


			@ApiModelProperty(value = "是否可开始：0=不可以；1=可以", example = "1")
			@TableField(exist = false)
			private Integer canStart;

			}