From caa2b51bb4133f5a2e59eac242e744fb57f864a0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 10 九月 2024 13:01:44 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TShoppingOrder.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TShoppingOrder.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TShoppingOrder.java
index 03de2ec..eb32601 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TShoppingOrder.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TShoppingOrder.java
@@ -116,7 +116,7 @@
@ApiModelProperty(value = "发货人id")
@TableField("consigner_id")
- private Integer consignerId;
+ private Long consignerId;
@ApiModelProperty(value = "发货时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@@ -135,7 +135,7 @@
@ApiModelProperty(value = "取消人id")
@TableField("cancellation_id")
- private Integer cancellationId;
+ private Long cancellationId;
@ApiModelProperty(value = "退款流水号")
@TableField("refund_code")
@@ -157,5 +157,31 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("refund_time")
private LocalDateTime refundTime;
+ @ApiModelProperty(value = "支付时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("pay_time")
+ private LocalDateTime payTime;
+
+ @ApiModelProperty(value = "下单手机号")
+ @TableField(exist = false)
+ private String phone;
+ @ApiModelProperty(value = "商品/优惠券名称")
+ @TableField(exist = false)
+ private String name;
+ @ApiModelProperty(value = "收货人")
+ @TableField(exist = false)
+ private String receivingName;
+ @ApiModelProperty(value = "收货地址")
+ @TableField(exist = false)
+ private String receivingAddress;
+ @ApiModelProperty(value = "发货人")
+ @TableField(exist = false)
+ private String consignerName;
+ @ApiModelProperty(value = "取消人")
+ @TableField(exist = false)
+ private String cancellationName;
+ @ApiModelProperty(value = "订单id")
+ @TableField(exist = false)
+ private String uid;
}
--
Gitblit v1.7.1