java/jiashida.git

			@@ -1,18 +1,18 @@
			package com.ruoyi.system.model;

			import java.math.BigDecimal;

			import cn.afterturn.easypoi.excel.annotation.Excel;
			import com.baomidou.mybatisplus.annotation.TableName;
			import com.baomidou.mybatisplus.annotation.IdType;
			import com.baomidou.mybatisplus.annotation.TableId;
			import java.time.LocalDateTime;
			import com.baomidou.mybatisplus.annotation.TableField;
			import java.io.Serializable;
			import com.baomidou.mybatisplus.annotation.TableId;
			import com.baomidou.mybatisplus.annotation.TableName;
			import io.swagger.annotations.ApiModel;
			import io.swagger.annotations.ApiModelProperty;
			import lombok.Data;
			import lombok.EqualsAndHashCode;

			import java.io.Serializable;
			import java.math.BigDecimal;
			import java.time.LocalDateTime;

			/**
			* <p>
			@@ -78,8 +78,7 @@
			@ApiModelProperty(value = "支付金额")
			@TableField("payment_price")
			private BigDecimal paymentPrice;

			@ApiModelProperty(value = "订单状态（1=待付款，2=已付订金，3=完成支付，4=确认收货，5=已退款）")
			@ApiModelProperty(value = "订单状态（1=待付款，2=已付订金，3=完成支付，4=确认收货，5=已退款，6=已取消）")
			@TableField("status")
			private Integer status;

			@@ -104,6 +103,10 @@
			@TableField("deposit_payment_serial_number")
			private String depositPaymentSerialNumber;

			@ApiModelProperty(value = "订金付款第三方流水号")
			@TableField("deposit_payment_third_serial_number")
			private String depositPaymentThirdSerialNumber;

			@ApiModelProperty(value = "尾款付款时间")
			@TableField("final_payment_time")
			private LocalDateTime finalPaymentTime;
			@@ -115,6 +118,14 @@
			@ApiModelProperty(value = "尾款付款流水号")
			@TableField("final_payment_serial_number")
			private String finalPaymentSerialNumber;

			@ApiModelProperty(value = "尾款付款第三方流水号")
			@TableField("final_payment_third_serial_number")
			private String finalPaymentThirdSerialNumber;

			@ApiModelProperty(value = "支付订单号（用于工行支付，多订单合并支付时共用同一个支付订单号）")
			@TableField("pay_order_code")
			private String payOrderCode;

			@ApiModelProperty(value = "删除状态（0=否，1=是）")
			@TableField("del_flag")
			@@ -162,6 +173,10 @@
			@Excel(name = "审核状态",replace = {"待审核_1","已通过_2","已驳回_3"})
			private Integer auditStatus;

			@ApiModelProperty(value = "是否启用生效日")
			@TableField("effect_day_flag")
			private Boolean effectDayFlag;

			@ApiModelProperty(value = "商品封面")
			@TableField(exist = false)
			private String bigGiftPackageCover;