Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -212,7 +212,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         int recordNum = practiceLessonApplyDao.checkUserIsApply(userId);
         LocalDateTime now=LocalDateTime.now();
         if(recordNum>0){
-            LocalDateTime applyExpireDateTime=LocalDateTime.parse("2020-03-01 00:00:00", DateUtil.dateTimeFormatter);
+            LocalDateTime applyExpireDateTime=LocalDateTime.parse("2020-02-29 00:00:00", DateUtil.dateTimeFormatter);
             result.put("canApply", now.compareTo(applyExpireDateTime)<=0?1:0);
         }else{
             LocalDateTime applyExpireDateTime=LocalDateTime.parse("2020-02-22 20:00:00", DateUtil.dateTimeFormatter);
@@ -1646,7 +1646,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         int recordNum = practiceLessonApplyDao.checkUserIsApply(practiceGroup.getStudentId());
         if(recordNum>0){
             LocalDateTime nowDateTime=LocalDateTime.now();
-            LocalDateTime applyExpireDateTime=LocalDateTime.parse("2020-03-01 00:00:00", DateUtil.dateTimeFormatter);
+            LocalDateTime applyExpireDateTime=LocalDateTime.parse("2020-02-29 00:00:00", DateUtil.dateTimeFormatter);
             if(nowDateTime.compareTo(applyExpireDateTime)>0){
                 result.put("status", "APPLY_DATE_OVERFLOW");
                 result.put("info", "预约失败，超出可预约时间范围。");
@@ -2384,6 +2384,10 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         ZoneId zoneId = ZoneId.systemDefault();
 
         LocalDate now = LocalDate.now();
+        LocalDate tempCourseDate=LocalDate.parse("2020-03-01", DateUtil.dateFormatter);
+        if(now.isBefore(tempCourseDate)){
+            now = tempCourseDate;
+        }
         if(renew){
             PracticeGroup userLatestPracticeGroup = practiceGroupDao.findUserPracticeGroup(userId,groupId);
             if(Objects.nonNull(userLatestPracticeGroup)){
@@ -2641,6 +2645,10 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
 
         Date now=new Date();
         LocalDate courseStartDay=LocalDate.now();
+        LocalDate tempCourseLocalDate=LocalDate.parse("2020-03-01", DateUtil.dateFormatter);
+        if(courseStartDay.isBefore(tempCourseLocalDate)){
+            courseStartDay = tempCourseLocalDate;
+        }
         if(practiceGroupBuyParams.isRenew()){
             if(Objects.isNull(practiceGroupBuyParams.getGroupId())){
                 return BaseController.failed(HttpStatus.EXPECTATION_FAILED, "请选择需要续费的课程");

mec-util/src/main/java/com/ym/mec/util/http/HttpUtil.java

@@ -44,7 +44,12 @@ public class HttpUtil {
 			paramMap.put("url",URLDecoder.decode(url,"UTF-8"));
 			paramMap.put("key","5dc941c5d3c3816ac84898d7@3d0e03b46a30f4fea51f038e5cd411c5");
 			String s = get("http://mrw.so/api.htm", paramMap);
-			return JSONObject.parseObject(s).getString("url");
+			String shortUrl=JSONObject.parseObject(s).getString("url");
+			if(StringUtils.isNotBlank(shortUrl)){
+				return shortUrl;
+			}else{
+				return url;
+			}
 		}catch (Exception e){
 			return url;
 		}