From c2afa40d244199d4476c0dbb13c8ecac89caeac3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E8=89=AF=28004796=29?= <zhanglian.zl@fcbox.com>
Date: Tue, 14 May 2024 15:24:58 +0800
Subject: [PATCH] init

---
 .../ruoyi/xq/service/impl/ActivityShopServiceImpl.java | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/ActivityShopServiceImpl.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/ActivityShopServiceImpl.java
index 843cc0e..72bbd6e 100644
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/ActivityShopServiceImpl.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/ActivityShopServiceImpl.java
@@ -277,7 +277,10 @@ public class ActivityShopServiceImpl extends ServiceImpl<ActivityShopMapper,Acti
         String code = codeKit.nextCodeActivity();
         bo.setActivityCode(code);
         if(bo.getStartTime().isAfter(bo.getEndTime())){
-            throw new ServiceException("开始时间不能大于结束时间");
+            throw new ServiceException("报名开始时间不能大于报名结束时间");
+        }
+        if(bo.getActivityStartTime().isAfter(bo.getActivityEndTime())){
+            throw new ServiceException("活动开始时间不能大于活动结束时间");
         }
         AreaCode areaCode = areaCodeService.getById(bo.getCityCode());
         bo.setCityName(areaCode.getName());
@@ -287,7 +290,10 @@ public class ActivityShopServiceImpl extends ServiceImpl<ActivityShopMapper,Acti
     @Override
     public void updateData(ActivityShopAdminUpdateReq bo) {
         if(bo.getStartTime().isAfter(bo.getEndTime())){
-            throw new ServiceException("开始时间不能大于结束时间");
+            throw new ServiceException("报名开始时间不能大于报名结束时间");
+        }
+        if(bo.getActivityStartTime().isAfter(bo.getActivityEndTime())){
+            throw new ServiceException("活动开始时间不能大于活动结束时间");
         }
         ActivityShop update = BeanConvertUtil.convertTo(bo, ActivityShop::new);
         AreaCode areaCode = areaCodeService.getById(bo.getCityCode());