feat：1212

mec-biz/src/main/java/com/ym/mec/biz/service/DegreeRegistrationService.java

@@ -8,11 +8,9 @@ import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
 import com.ym.mec.biz.dal.page.DegreeQueryInfo;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.service.BaseService;
+import com.ym.mec.util.date.DateUtil;
 
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 public interface DegreeRegistrationService extends BaseService<Integer, DegreeRegistration> {
 
@@ -20,6 +18,8 @@ public interface DegreeRegistrationService extends BaseService<Integer, DegreeRe
 
     Set<String> FREE_PRICE_LEVEL = new HashSet<>(Arrays.asList(new String[]{"一级", "二级", "三级"}));
 
+    Date ACTIVITY_END_TIME = DateUtil.stringToDate("2020-12-31 23:59:59", "yyyy-MM-dd HH:mm:ss");
+
     HttpResponseResult pay(DegreeRegistrationActivityDto degreeRegistration) throws Exception;
 
     Boolean updateStatus(StudentPaymentOrder order);

mec-biz/src/main/java/com/ym/mec/biz/service/impl/DegreeRegistrationServiceImpl.java

@@ -93,6 +93,10 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
 
         Date nowDate = new Date();
 
+        if(ACTIVITY_END_TIME.compareTo(nowDate)<0){
+            throw new BizException("活动已截至");
+        }
+
         String orderNo = idGeneratorService.generatorId("payment") + "";
 
         //获取收费项价格