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