Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into zx-saas-11-06

mec-application/src/main/java/com/ym/mec/web/controller/open/OpenDouble11StaticsController.java

@@ -262,11 +262,7 @@ public class OpenDouble11StaticsController extends BaseController {
                                Double11StaticWrapper.SaleStaticConfigParam configParam) {
 
         Integer saleStaticsType = query.getSaleStaticsType();
-        query.setGroupType(null);
-        query.setType(null);
-        query.setActivityId(null);
-        query.setGoodId(null);
-        query.setMusicGroupId(null);
+        query.clearValue();
         if (StringUtils.isEmpty(query.getOrganId())) {
             query.setTenantId(Optional.ofNullable(configParam.getTenantId()).orElse(1));
         }

mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/Double11StaticWrapper.java

@@ -60,6 +60,16 @@ public class Double11StaticWrapper {
         @ApiModelProperty(hidden = true)
         private Date endPayTime;
 
+        public void clearValue() {
+            this.setGroupType(null);
+            this.setType(null);
+            this.setActivityId(null);
+            this.setGoodId(null);
+            this.setMusicGroupId(null);
+            this.setStartPayTime(null);
+            this.setEndPayTime(null);
+        }
+
     }
 
     @ApiModel("分部学生购买")

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

@@ -2092,9 +2092,6 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
 
     //url路径改造
     private static String urlTypeChange(String url){
-        if (true){
-            return url;
-        }
         if (url.isEmpty()){
             log.warn("url为空");
         }
@@ -2131,7 +2128,39 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
             replace = url.replace("https://question-bank.ks3-cn-beijing.ksyuncs.com", "https://oss.dayaedu.com/question-bank");
         } else if (url.startsWith("https://video-course.ks3-cn-beijing.ksyuncs.com")){
             replace = url.replace("https://video-course.ks3-cn-beijing.ksyuncs.com", "https://oss.dayaedu.com/video-course");
-        } else {
+        } else if (url.startsWith("https://ks3-cn-beijing.ksyun.com")){
+            replace = url.replace("https://ks3-cn-beijing.ksyun.com", "https://oss.dayaedu.com");
+        } else if (url.startsWith("https://daya.ks3-cn-beijing.ksyun.com")){
+            replace = url.replace("https://daya.ks3-cn-beijing.ksyun.com", "https://oss.dayaedu.com/daya");
+        } else if (url.startsWith("https://appstore.ks3-cn-beijing.ksyun.com")){
+            replace = url.replace("https://appstore.ks3-cn-beijing.ksyun.com", "https://oss.dayaedu.com/appstore");
+        } else if (url.startsWith("https://cloud-coach.ks3-cn-beijing.ksyun.com")){
+            replace = url.replace("https://cloud-coach.ks3-cn-beijing.ksyun.com", "https://oss.dayaedu.com/cloud-coach");
+        } else if (url.startsWith("https://contracts.ks3-cn-beijing.ksyun.com")){
+            replace = url.replace("https://contracts.ks3-cn-beijing.ksyun.com", "https://oss.dayaedu.com/contracts");
+        } else if (url.startsWith("https://cooperation.ks3-cn-beijing.ksyun.com")){
+            replace = url.replace("https://cooperation.ks3-cn-beijing.ksyun.com", "https://oss.dayaedu.com/cooperation");
+        } else if (url.startsWith("https://daya-docs.ks3-cn-beijing.ksyun.com")){
+            replace = url.replace("https://daya-docs.ks3-cn-beijing.ksyun.com", "https://oss.dayaedu.com/daya-docs");
+        } else if (url.startsWith("https://gyt.ks3-cn-beijing.ksyun.com")){
+            replace = url.replace("https://gyt.ks3-cn-beijing.ksyun.com", "https://oss.dayaedu.com/gyt");
+        } else if (url.startsWith("https://homework.ks3-cn-beijing.ksyun.com")){
+            replace = url.replace("https://homework.ks3-cn-beijing.ksyun.com", "https://oss.dayaedu.com/homework");
+        } else if (url.startsWith("https://i-m.ks3-cn-beijing.ksyun.com")){
+            replace = url.replace("https://i-m.ks3-cn-beijing.ksyun.com", "https://oss.dayaedu.com/i-m");
+        } else if (url.startsWith("https://live-rewind.ks3-cn-beijing.ksyun.com")){
+            replace = url.replace("https://live-rewind.ks3-cn-beijing.ksyun.com", "https://oss.dayaedu.com/live-rewind");
+        } else if (url.startsWith("https://mall.ks3-cn-beijing.ksyun.com")){
+            replace = url.replace("https://mall.ks3-cn-beijing.ksyun.com", "https://oss.dayaedu.com/mall");
+        } else if (url.startsWith("https://musescoreconverresult.ks3-cn-beijing.ksyun.com")){
+            replace = url.replace("https://musescoreconverresult.ks3-cn-beijing.ksyun.com", "https://oss.dayaedu.com/musescoreconverresult");
+        } else if (url.startsWith("https://news-info.ks3-cn-beijing.ksyun.com")){
+            replace = url.replace("https://news-info.ks3-cn-beijing.ksyun.com", "https://oss.dayaedu.com/news-info");
+        } else if (url.startsWith("https://question-bank.ks3-cn-beijing.ksyun.com")){
+            replace = url.replace("https://question-bank.ks3-cn-beijing.ksyun.com", "https://oss.dayaedu.com/question-bank");
+        } else if (url.startsWith("https://video-course.ks3-cn-beijing.ksyun.com")){
+            replace = url.replace("https://video-course.ks3-cn-beijing.ksyun.com", "https://oss.dayaedu.com/video-course");
+        }else {
             return url;
         }
         return replace;