diff --git a/flash-sale-frontend/src/pages/admin/flashsales.vue b/flash-sale-frontend/src/pages/admin/flashsales.vue index dc62d10..eda6dfe 100644 --- a/flash-sale-frontend/src/pages/admin/flashsales.vue +++ b/flash-sale-frontend/src/pages/admin/flashsales.vue @@ -275,10 +275,12 @@ const getStockRate = (item: FlashSale) => { return Math.round((item.remainingStock / item.flashStock) * 100) } -const disablePastDate = (date: Date) => dayjs(date).endOf('day').isBefore(dayjs()) +const disablePastDate = (date: Date) => { + if (formMode.value === 'edit') return false + return dayjs(date).endOf('day').isBefore(dayjs()) +} const validateTimeRange = () => { - const now = dayjs() const startTime = dayjs(form.startTime) const endTime = dayjs(form.endTime) @@ -287,7 +289,7 @@ const validateTimeRange = () => { return false } - if (!startTime.isAfter(now)) { + if (formMode.value === 'create' && !startTime.isAfter(dayjs())) { ElMessage.error('开始时间必须晚于当前时间') return false } diff --git a/flash-sale-frontend/src/pages/admin/groupbuying.vue b/flash-sale-frontend/src/pages/admin/groupbuying.vue index 8c89c43..4056918 100644 --- a/flash-sale-frontend/src/pages/admin/groupbuying.vue +++ b/flash-sale-frontend/src/pages/admin/groupbuying.vue @@ -235,10 +235,12 @@ const getStatusType = (status: string) => { } } -const disablePastDate = (date: Date) => dayjs(date).endOf('day').isBefore(dayjs()) +const disablePastDate = (date: Date) => { + if (editingId.value) return false + return dayjs(date).endOf('day').isBefore(dayjs()) +} const validateTimeRange = () => { - const now = dayjs() const startTime = dayjs(form.startTime) const endTime = dayjs(form.endTime) @@ -247,7 +249,7 @@ const validateTimeRange = () => { return false } - if (!startTime.isAfter(now)) { + if (!editingId.value && !startTime.isAfter(dayjs())) { ElMessage.error('开始时间必须晚于当前时间') return false } diff --git a/src/main/java/com/org/flashsalesystem/repository/GroupBuyingGroupRepository.java b/src/main/java/com/org/flashsalesystem/repository/GroupBuyingGroupRepository.java index 2da8398..5f07cc0 100644 --- a/src/main/java/com/org/flashsalesystem/repository/GroupBuyingGroupRepository.java +++ b/src/main/java/com/org/flashsalesystem/repository/GroupBuyingGroupRepository.java @@ -33,11 +33,11 @@ public interface GroupBuyingGroupRepository extends JpaRepository 0") int decrementCurrentMembers(@Param("id") Long id); diff --git a/src/main/java/com/org/flashsalesystem/service/GroupBuyingService.java b/src/main/java/com/org/flashsalesystem/service/GroupBuyingService.java index 73ce462..3b81a16 100644 --- a/src/main/java/com/org/flashsalesystem/service/GroupBuyingService.java +++ b/src/main/java/com/org/flashsalesystem/service/GroupBuyingService.java @@ -109,10 +109,6 @@ public class GroupBuyingService { GroupBuying gb = groupBuyingRepository.findById(id) .orElseThrow(() -> new RuntimeException("拼团活动不存在")); - if (gb.getStatus() == 2) { - throw new RuntimeException("进行中的活动不能修改"); - } - if (updateDTO.getProductId() != null) gb.setProductId(updateDTO.getProductId()); if (updateDTO.getGroupPrice() != null) gb.setGroupPrice(updateDTO.getGroupPrice()); if (updateDTO.getRequiredMembers() != null) gb.setRequiredMembers(updateDTO.getRequiredMembers());