Merge remote-tracking branch 'origin/children_day' into children_day

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MusicGroupDao.java

@@ -406,5 +406,5 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
      */
     MusicGroup getStudentLastMusicGroup(@Param("userId") Integer userId);
 
-    List<MusicGroup> findByCooperationId(@Param("cooperationId") Integer cooperationOrganId, @Param("musicStatus") String musicStatus);
+    List<MusicGroup> findByCooperationId(@Param("cooperationId") Integer cooperationOrganId);
 }

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

@@ -653,6 +653,9 @@ public class ClassGroupStudentMapperServiceImpl extends BaseServiceImpl<Long, Cl
         List<CourseScheduleStudentPayment> courseScheduleStudentPayments = new ArrayList<>();
         //获取冻结的课程列表
         List<CourseSchedule> classGroupNotStartCourse = courseScheduleDao.findCoursesByClassGroupIdAndCourseIds(classGroupId,allLockCourseIds);
+        if(classGroupNotStartCourse.size() == 0){
+            throw new BizException("操作失败：主班没有未开始的课程");
+        }
 
         Date now = new Date();
         List<ClassGroupStudentMapper> classGroupStudentMappers = new ArrayList<>();

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

@@ -3012,7 +3012,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 
     @Override
     public List<MusicGroup> findByCooperationId(Integer cooperationId) {
-        return musicGroupDao.findByCooperationId(cooperationId,"PROGRESS");
+        return musicGroupDao.findByCooperationId(cooperationId);
     }
 
 }

mec-biz/src/main/resources/config/mybatis/ChildrenDayReserveMapper.xml

@@ -232,6 +232,15 @@
             <if test="isReserve != null">
                 AND cdr.is_reserve_ = #{isReserve}
             </if>
+            <if test="organId != null and organId != ''">
+                AND cdr.organ_id_ = #{organId}
+            </if>
+            <if test="cooperationId != null">
+                AND cdr.cooperation_organ_id_ = #{cooperationId}
+            </if>
+            <if test="cooperationId == null">
+                AND cdr.cooperation_organ_id_ IS NULL
+            </if>
             <if test="musicGroupId != null and musicGroupId != ''">
                 AND cdr.music_group_id_ = #{musicGroupId}
             </if>

mec-biz/src/main/resources/config/mybatis/MusicGroupMapper.xml

@@ -741,9 +741,6 @@
     </select>
     <select id="findByCooperationId" resultMap="MusicGroup">
         SELECT * FROM music_group WHERE cooperation_organ_id_ = #{cooperationId}
-        <if test="musicStatus != null">
-            AND status_ = #{musicStatus}
-        </if>
     </select>
 
     <select id="getStudentLastMusicGroup" resultMap="MusicGroup">

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

@@ -1,5 +1,6 @@
 package com.ym.mec.util.http;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.ym.mec.util.compress.ZipUtil;
 import org.apache.commons.beanutils.ConvertUtils;
@@ -39,15 +40,24 @@ public class HttpUtil {
 
 	public static String getSortUrl(String url){
 		try {
-			Map<String,Object> paramMap = new HashMap<>();
-			paramMap.put("format","json");
-			paramMap.put("url",URLDecoder.decode(url,"UTF-8"));
-			paramMap.put("key","5dc941c5d3c3816ac84898d7@3d0e03b46a30f4fea51f038e5cd411c5");
-			String s = get("http://mrw.so/api.htm", paramMap);
-			String shortUrl=JSONObject.parseObject(s).getString("url");
-			if(StringUtils.isNotBlank(shortUrl)){
+			JSONArray jsonArray = new JSONArray();
+			JSONObject jsonObject = new JSONObject();
+			jsonObject.put("LongUrl",url);
+			jsonObject.put("TermOfValidity","long-term");
+			jsonArray.add(jsonObject);
+			Map<String,String> HeadMap = new HashMap<>();
+			HeadMap.put("Dwz-Token","0a9d3b34eae990d4355653d2ba6c8974");
+			HeadMap.put("Content-Type","application/json; charset=UTF-8");
+			HeadMap.put("Content-Language","zh");
+			String s = postForHttps("https://dwz.cn/api/v3/short-urls", jsonArray.toJSONString(),HeadMap);
+			JSONObject result = JSONObject.parseObject(s);
+			String code=result.getString("Code");
+			if(code.equals("0")){
+				String shortUrl = JSONArray.parseArray(result.getString("ShortUrls")).getJSONObject(0).getString("ShortUrl");
 				return shortUrl;
 			}else{
+				String errorMsg = JSONArray.parseArray(result.getString("ShortUrls")).getJSONObject(0).getString("ErrMsg");
+				System.out.println("短网址生成失败:" + errorMsg);
 				return url;
 			}
 		}catch (Exception e){