From ccbd86bc5f747b748b5bde257a789d748b8cefbb Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 11 Sep 2025 17:41:35 +0800
Subject: [PATCH] ``` refactor(service): 在设置活动类别名称前增加非空检查在AdminHappyActivityServiceImpl.java中，对happyActivity的categoryId进行了非空检查，并且确认categoryMap中包含该categoryId后，再设置其categoryName。这样可以避免因为空值或不存在的键导致的潜在异常。 ```
---
src/main/java/cc/mrbird/febs/mall/vo/OrderListVo.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 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 21266e9..9b09c26 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/OrderListVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/OrderListVo.java
@@ -27,6 +27,9 @@
@ApiModelProperty(value = "状态 1-待支付 2-待发货 3-待收货 4-已完成 5-退款中 6-退款处理完成 7-已取消")
private Integer status;
+ //支付积分
+ @ApiModelProperty(value = "订单积分")
+ private BigDecimal scoreAmount;
@ApiModelProperty(value = "订单金额")
private BigDecimal amount;
@@ -42,4 +45,25 @@
@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