From cadeca36ff86f74371c77a05dc8422abc1e48855 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 19 Dec 2024 16:28:40 +0800
Subject: [PATCH] feat(table): 添加合计行功能 - 在 mallMemberList.html 中添加了 totalRow 属性，用于显示碳币和碳积分的合计 - 在 moneyFlowList.html 中移除了 description 字段的 totalRow属性 - 在 sellVipList.html 中将 amount 和 amountFee 字段的 totalRow 属性改为 true
---
src/main/java/cc/mrbird/febs/mall/vo/OrderListVo.java | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/OrderListVo.java b/src/main/java/cc/mrbird/febs/mall/vo/OrderListVo.java
index 24b70e1..a1a4923 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/OrderListVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/OrderListVo.java
@@ -25,7 +25,7 @@
@ApiModelProperty(value = "下单时间")
private Date orderTime;
- @ApiModelProperty(value = "状态 1-待支付2-待发货3-待收货4-已完成5-退款中6-已退款7-已取消")
+ @ApiModelProperty(value = "状态 1-待支付 2-待发货 3-待收货 4-已完成 5-退款中 6-退款处理完成 7-已取消")
private Integer status;
@ApiModelProperty(value = "订单金额")
@@ -33,4 +33,34 @@
@ApiModelProperty(value = "订单明细")
private List<OrderItemVo> items;
+
+ @ApiModelProperty(value = "订单类型 1-普通订单 2-积分订单")
+ private Integer orderType;
+
+ @ApiModelProperty(value = "运费")
+ private BigDecimal carriage;
+
+ @ApiModelProperty(value = "评价状态 1：待评价 2：已评价")
+ private Integer commentState;
+
+ @ApiModelProperty(value = "提货码")
+ private String takeCode;
+
+ @ApiModelProperty(value = "提货人姓名")
+ private String name;
+
+ @ApiModelProperty(value = "提货人电话")
+ private String phone;
+
+ @ApiModelProperty(value = "配送状态 1：待配送 2：配送中 3：已送达")
+ private Integer deliveryState;
+
+ @ApiModelProperty(value = "是否送货上门 1：是 2：否")
+ private Integer isHome;
+
+ @ApiModelProperty(value = "快递单号")
+ private String expressNo;
+
+ @ApiModelProperty(value = "是否赠送 1-是 2-否")
+ private Integer isFree;
}
--
Gitblit v1.9.1