fs-qwhook/src/main/java/com/fs/app/controller/ApisFsUserCourseVideoController.java

@@ -163,7 +163,11 @@ public class ApisFsUserCourseVideoController extends BaseController {
             return R.error("客户id不能为空");
         }
 
-        return fsUserCourseVideoService.createCartLink(param);
+        if (param.getType()==null || param.getType()==1){
+            return fsUserCourseVideoService.createCartLink(param);
+        }else {
+            return fsUserCourseVideoService.createMiniLink(param);
+        }
     }
 
     @GetMapping("/createRoomLink")

fs-service/src/main/java/com/fs/core/config/WxMaConfiguration.java

@@ -21,6 +21,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.yaml.snakeyaml.events.Event;
 
 import javax.annotation.PostConstruct;
 import java.io.File;
@@ -49,6 +50,9 @@ public class WxMaConfiguration {
         if (StringUtil.isNotEmpty(config.getAppid())){
             c.add(config);
         }
+
+        c.add(config);
+        String appid = config.getAppid();
 //        SysConfig sysConfig2 = sysConfigMapper.selectConfigByConfigKey("store.config");
 //        if (sysConfig2!=null&&sysConfig2.getConfigValue()!=null&&sysConfig2.getConfigValue()!="") {
 //            String configValue2 = sysConfig2.getConfigValue();
@@ -60,6 +64,9 @@ public class WxMaConfiguration {
         List<CourseMaConfig> courseMaConfigs = JSON.parseArray(sysConfig3.getConfigValue(), CourseMaConfig.class);
         if (courseMaConfigs!=null&& !courseMaConfigs.isEmpty()){
             for (CourseMaConfig courseMaConfig : courseMaConfigs) {
+                if (appid.equals(courseMaConfig.getAppid())) {
+                    continue;
+                }
                 WxMaConfig.Config wxMaConfig = new WxMaConfig.Config();
                 BeanUtils.copyProperties(courseMaConfig, wxMaConfig);
                 c.add(wxMaConfig);