From c832cae4de3ff53e3b80cad317fbdd84de46c02d Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期五, 19 七月 2024 09:31:34 +0800
Subject: [PATCH] fix: 学习端bug
---
ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/TOrder.java | 69 ++++++++++++++++++++++++----------
1 files changed, 49 insertions(+), 20 deletions(-)
diff --git a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/TOrder.java b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/TOrder.java
index d1a71ff..bbd5cab 100644
--- a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/TOrder.java
+++ b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/TOrder.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.web.domain.BaseModel;
@@ -27,51 +28,73 @@
/**
* 主键id
*/
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ @TableId(value = "id", type = IdType.NONE)
+ private Long id;
/**
* 订单编号
*/
+ @ApiModelProperty("订单编号")
private String orderNumber;
/**
* 用户id
*/
+ @ApiModelProperty("用户id")
private Integer userId;
/**
* 下单时间
*/
+ @ApiModelProperty(value = "下单时间")
private Date insertTime;
+ @ApiModelProperty(value = "完成时间")
private Date completeTime;
/**
* 商品id
*/
+ @ApiModelProperty(value = "商品id")
private Integer goodsId;
/**
* 购买数量
*/
+ @ApiModelProperty(value = "购买数量")
private Integer count;
/**
* 订单状态1待发货2已发货3已完成
*/
+ @ApiModelProperty(value = "订单状态1待发货2已发货3已完成")
private Integer state;
/**
* 快递名称
*/
+ @ApiModelProperty(value = "快递名称")
private String express;
/**
* 快递编号
*/
+ @ApiModelProperty(value = "快递编号")
private String expressNumber;
/**
* 发货时间
*/
+ @ApiModelProperty(value = "发货时间")
private Date expressTime;
/**
* 消耗积分
*/
+ @ApiModelProperty(value = "消耗积分")
private Integer integral;
@ApiModelProperty(value = "收货人姓名")
private String consigneeName;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "商品图片")
+ private String img;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "商品名称")
+ private String name;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "商品类型")
+ private String type;
+
/**
* 消耗积分
*/
@@ -80,13 +103,19 @@
@ApiModelProperty(value = "收货人地址")
private String consigneeAddress;
- public Integer getId() {
- return id;
- }
+ @ApiModelProperty(value = "收货地址 所属省")
+ @TableField("province")
+ private String province;
+ @ApiModelProperty(value = "收货地址 所属市")
+ @TableField("city")
+ private String city;
- public void setId(Integer id) {
- this.id = id;
- }
+ @ApiModelProperty(value = "订单备注")
+ @TableField("remark")
+ private String remark;
+
+
+
public String getOrderNumber() {
return orderNumber;
@@ -171,17 +200,17 @@
@Override
public String toString() {
return "TOrder{" +
- ", id=" + id +
- ", orderNumber=" + orderNumber +
- ", userId=" + userId +
- ", insertTime=" + insertTime +
- ", goodsId=" + goodsId +
- ", count=" + count +
- ", state=" + state +
- ", express=" + express +
- ", expressNumber=" + expressNumber +
- ", expressTime=" + expressTime +
- ", integral=" + integral +
- "}";
+ ", id=" + id +
+ ", orderNumber=" + orderNumber +
+ ", userId=" + userId +
+ ", insertTime=" + insertTime +
+ ", goodsId=" + goodsId +
+ ", count=" + count +
+ ", state=" + state +
+ ", express=" + express +
+ ", expressNumber=" + expressNumber +
+ ", expressTime=" + expressTime +
+ ", integral=" + integral +
+ "}";
}
}
--
Gitblit v1.7.1