From 430e76074da75d027f11979b1a380d55a8d77e3b Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Fri, 10 Oct 2025 14:52:10 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E8=87=AA=E5=8A=A8=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=AE=BE=E7=BD=AE=E4=B8=BA10=E5=A4=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trade/controller/admin/config/vo/TradeConfigBaseVO.java  | 4 ++++
 .../module/trade/dal/dataobject/config/TradeConfigDO.java    | 5 +++++
 yudao-server/src/main/resources/application.yaml             | 2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/config/vo/TradeConfigBaseVO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/config/vo/TradeConfigBaseVO.java
index 3c58275..ac1ef1c 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/config/vo/TradeConfigBaseVO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/config/vo/TradeConfigBaseVO.java
@@ -48,6 +48,10 @@ public class TradeConfigBaseVO {
     @NotNull(message = "是否开启自提不能为空")
     private Boolean deliveryPickUpEnabled;
 
+    @Schema(description = "自动收货时间(天)", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
+    @NotNull(message = "自动收货时间(天)不能为空")
+    private Integer deliveryAutoReceiveDay;
+
     // ========== 分销相关 ==========
 
     @Schema(description = "是否启用分佣", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/config/TradeConfigDO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/config/TradeConfigDO.java
index 5d7116b..8958d86 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/config/TradeConfigDO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/config/TradeConfigDO.java
@@ -64,6 +64,11 @@ public class TradeConfigDO extends BaseDO {
      */
     private Boolean deliveryPickUpEnabled;
 
+    /**
+     * 自动收货时间(天)
+     */
+    private Integer deliveryAutoReceiveDay;
+
     // ========== 分销相关 ==========
 
     /**
diff --git a/yudao-server/src/main/resources/application.yaml b/yudao-server/src/main/resources/application.yaml
index ffbef4d..c5d0ae1 100644
--- a/yudao-server/src/main/resources/application.yaml
+++ b/yudao-server/src/main/resources/application.yaml
@@ -347,7 +347,7 @@ yudao:
   trade:
     order:
       pay-expire-time: 2h # 支付的过期时间
-      receive-expire-time: 14d # 收货的过期时间
+      receive-expire-time: 10d # 收货的过期时间
       comment-expire-time: 7d # 评论的过期时间
     express:
       client: KD_NIAO