From 2e0ab4a5f88bd3f947efd4f34db7f0981ab47351 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 05 九月 2025 11:28:15 +0800
Subject: [PATCH] 修改查询
---
ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/TOrder.java | 46 ++++++++++++++++++++++++++--------------------
1 files changed, 26 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 4af4ab4..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
@@ -28,8 +28,8 @@
/**
* 主键id
*/
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ @TableId(value = "id", type = IdType.NONE)
+ private Long id;
/**
* 订单编号
*/
@@ -80,6 +80,7 @@
/**
* 消耗积分
*/
+ @ApiModelProperty(value = "消耗积分")
private Integer integral;
@ApiModelProperty(value = "收货人姓名")
private String consigneeName;
@@ -102,14 +103,19 @@
@ApiModelProperty(value = "收货人地址")
private String consigneeAddress;
+ @ApiModelProperty(value = "收货地址 所属省")
+ @TableField("province")
+ private String province;
+ @ApiModelProperty(value = "收货地址 所属市")
+ @TableField("city")
+ private String city;
- public Integer getId() {
- return id;
- }
+ @ApiModelProperty(value = "订单备注")
+ @TableField("remark")
+ private String remark;
- public void setId(Integer id) {
- this.id = id;
- }
+
+
public String getOrderNumber() {
return orderNumber;
@@ -194,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