java/jiashida.git

			@@ -1,6 +1,8 @@
			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;
			@@ -34,6 +36,7 @@

			@ApiModelProperty(value = "订单编号")
			@TableField("code")
			@Excel(name = "订单编号")
			private String code;

			@ApiModelProperty(value = "所属公司")
			@@ -46,6 +49,7 @@

			@ApiModelProperty(value = "下单时间")
			@TableField("create_time")
			@Excel(name = "下单时间", format = "yyyy-MM-dd HH:mm:ss")
			private LocalDateTime createTime;

			@ApiModelProperty(value = "实物商品id")
			@@ -58,14 +62,16 @@

			@ApiModelProperty(value = "订单价格")
			@TableField("order_price")
			@Excel(name = "订单价格")
			private BigDecimal orderPrice;

			@ApiModelProperty(value = "支付金额")
			@TableField("payment_price")
			private BigDecimal paymentPrice;

			@ApiModelProperty(value = "订单状态（1=待付款，2=完成支付，3=确认收货，4=已退款）")
			@ApiModelProperty(value = "订单状态（1=待付款，2=完成支付，3=确认收货，4=已退款, 5=已取消）")
			@TableField("status")
			@Excel(name = "订单状态", replace = "待付款_1,完成支付_2,确认收货_3,已退款_4")
			private Integer status;

			@ApiModelProperty(value = "确认收货时间")
			@@ -78,7 +84,8 @@

			@ApiModelProperty(value = "付款方式（1=微信）")
			@TableField("payment_method")
			private Integer paymentMethod;
			@Excel(name = "支付方式", replace = "微信_1")
			private Integer paymentMethod=1;

			@ApiModelProperty(value = "付款流水号")
			@TableField("payment_serial_number")
			@@ -95,14 +102,17 @@

			@ApiModelProperty(value = "下单用户")
			@TableField(exist = false)
			@Excel(name = "下单用户")
			private String userName;

			@ApiModelProperty(value = "下单用户手机号")
			@TableField(exist = false)
			@Excel(name = "用户手机号")
			private String phone;

			@ApiModelProperty(value = "商品名称")
			@TableField(exist = false)
			@Excel(name = "商品名称")
			private String physicalGoodsName;

			@ApiModelProperty(value = "商品封面")