1、陪练课调整

2、付费陪练课

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

@@ -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;
 		}