From 2377b0ca8cd1839c80c6271a7067ea43a0b78aa7 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 27 May 2025 15:49:54 +0800
Subject: [PATCH] fix(order): 修复订单列表中提货方式的显示逻辑
---
src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java b/src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java
index 72b0f24..e9d1bc5 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java
@@ -25,6 +25,8 @@
private Date orderTime;
private Date payTime;
+ //支付积分
+ private BigDecimal scoreAmount;
private BigDecimal amount;
@@ -50,6 +52,7 @@
private String phone;
+ private Long addressId;
private String address;
private String longitude;
@@ -106,19 +109,35 @@
@TableField(exist = false)
private String addressPic;
@TableField(exist = false)
- private String province;
- @TableField(exist = false)
- private String city;
- @TableField(exist = false)
- private String township;
- @TableField(exist = false)
private String addressArea;
@TableField(exist = false)
private String detailAddress;
-
-
+ @TableField(exist = false)
+ private Double leaderLongitude;
+ @TableField(exist = false)
+ private Double leaderLatitude;
/**
* 微信订单编号
*/
private String wxOrderNo;
+ /**
+ * 配送状态 1：待配送 2：配送中 3：已送达
+ */
+ private Integer deliveryState;
+ /**
+ * 是否送货上门 1：是 2：否
+ */
+ private Integer isHome;
+ /**
+ * 是否开过发票 0：未开 1：已开
+ */
+ private Integer isInvoice;
+
+ @TableField(exist = false)
+ private String orderIds;
+
+ @TableField(exist = false)
+ private String expressNo;
+
+ private Integer isFree;
}
--
Gitblit v1.9.1