Главная Обзор Помощь
Вход
root
/
ylrz_his_scrm_java
1
0
Ответвить 0
Файлы Задачи 0 Запросы на слияние 0 Вики
Просмотр исходного кода

1、新增儿童协议
2、跳这个看课疗法包为展示问题

yys 1 месяц назад
Родитель
eacd12efdd
Сommit
ced5b73efd
7 измененных файлов с 79 добавлено и 3 удалено
Единый вид Показать статистику Diff
  1. 21 0
      fs-redis/src/main/resources/templates/childrenPrivacyPolicy.html
  2. 9 3
      fs-service/src/main/java/com/fs/course/mapper/FsDepVideoShowMapper.java
  3. 1 0
      fs-service/src/main/java/com/fs/his/config/AgreementConfig.java
  4. 6 0
      fs-service/src/main/java/com/fs/hisStore/config/AgreementConfig.java
  5. 11 0
      fs-user-app/src/main/java/com/fs/app/controller/H5Controller.java
  6. 10 0
      fs-user-app/src/main/java/com/fs/app/controller/store/H5ScrmController.java
  7. 21 0
      fs-user-app/src/main/resources/templates/childrenPrivacyPolicy.html

+ 21 - 0
fs-redis/src/main/resources/templates/childrenPrivacyPolicy.html
Просмотреть файл 

@@ -0,0 +1,21 @@
 
+<!DOCTYPE html>
 
+<html xmlns="http://www.w3.org/1999/xhtml"
 
+      xmlns:th="http://www.thymeleaf.org">
 
+<head>
 
+    <meta charset="UTF-8">
 
+    <meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
 
+    <title >儿童隐私保护协议</title>
 
+    <link  rel="stylesheet"/>
 
+    <style>
 
+        body{
 
+            background-color:#F8F8F8;
 
+        }
 
+    </style>
 
+<body>
 
+<div th:utext="${childrenPrivacyPolicy}" ></div>
 
+<script th:inline="javascript">
 
+
 
+</script>
 
+
 
+</body>
 
+</html>

+ 9 - 3
fs-service/src/main/java/com/fs/course/mapper/FsDepVideoShowMapper.java
Просмотреть файл 

@@ -9,14 +9,14 @@ import org.apache.ibatis.annotations.Update;
 
 
 
 /**
 
 /**
 
  * 部门视频疗包展示关联Mapper接口
 
  * 部门视频疗包展示关联Mapper接口
 
- * 
+ *
 
  * @author fs
 
  * @author fs
 
  * @date 2025-10-11
 
  * @date 2025-10-11
 
  */
 
  */
 
 public interface FsDepVideoShowMapper extends BaseMapper<FsDepVideoShow>{
 
 public interface FsDepVideoShowMapper extends BaseMapper<FsDepVideoShow>{
 
     /**
 
     /**
 
      * 部门视频疗包展示关联
 
      * 部门视频疗包展示关联
 
-     * 
+     *
 
      * @param videoId, depId  部门视频疗包展示关联主键
 
      * @param videoId, depId  部门视频疗包展示关联主键
 
      * @return 部门视频疗包展示关联
 
      * @return 部门视频疗包展示关联
 
      */
 
      */
 
@@ -37,7 +37,13 @@ public interface FsDepVideoShowMapper extends BaseMapper<FsDepVideoShow>{
 
     @Insert("INSERT INTO fs_dep_video_show(video_id, is_show, dep_id) VALUES(#{videoId}, #{isShow}, #{depId})")
 
     @Insert("INSERT INTO fs_dep_video_show(video_id, is_show, dep_id) VALUES(#{videoId}, #{isShow}, #{depId})")
 
     int insertFsDepVideoShowByVideoId(FsDepVideoShow fsDepVideoShow);
 
     int insertFsDepVideoShowByVideoId(FsDepVideoShow fsDepVideoShow);
 
 
 
-    @Update("UPDATE fs_dep_video_show SET is_show = #{isShow} WHERE video_id = #{videoId} AND dep_id = #{depId}")
 
+    @Update("<script>" +
 
+            "UPDATE fs_dep_video_show SET is_show = #{isShow} " +
 
+            "WHERE video_id = #{videoId} " +
 
+            "<if test='depId != null'>" +
 
+            "AND dep_id = #{depId} " +
 
+            "</if>" +
 
+            "</script>")
 
     int updateByVideoId(FsDepVideoShow fsDepVideoShow);
 
     int updateByVideoId(FsDepVideoShow fsDepVideoShow);
 
 
 
 }
 
 }

+ 1 - 0
fs-service/src/main/java/com/fs/his/config/AgreementConfig.java
Просмотреть файл 

@@ -12,4 +12,5 @@ public class AgreementConfig implements Serializable {
 
     String vipService;
 
     String vipService;
 
     String vipAutomaticService;
 
     String vipAutomaticService;
 
     String userRemoveService;
 
     String userRemoveService;
 
+    String childrenPrivacyPolicy;
 
 }
 
 }

+ 6 - 0
fs-service/src/main/java/com/fs/hisStore/config/AgreementConfig.java
Просмотреть файл 

@@ -20,4 +20,10 @@ public class AgreementConfig implements Serializable {
 
     String userHealth;
 
     String userHealth;
 
     //会员服务协议
 
     //会员服务协议
 
     String vipService;
 
     String vipService;
 
+    //会员自动续费协议
 
+    String vipAutomaticService;
 
+    //用户注销协议
 
+    String userRemoveService;
 
+    //儿童隐私协议
 
+    String childrenPrivacyPolicy;
 
 }
 
 }

+ 11 - 0
fs-user-app/src/main/java/com/fs/app/controller/H5Controller.java
Просмотреть файл 

@@ -86,5 +86,16 @@ public class H5Controller
 
         return mv;
 
         return mv;
 
     }
 
     }
 
 
 
+    @GetMapping("/childrenPrivacyPolicy")
 
+    public ModelAndView childrenPrivacyPolicy( )
 
+    {
 
+        String json=configService.selectConfigByKey("his.agreementConfig");
 
+        AgreementConfig config= JSONUtil.toBean(json, AgreementConfig.class);
 
+        ModelAndView mv=new ModelAndView();
 
+        mv.addObject("childrenPrivacyPolicy", config.getChildrenPrivacyPolicy());
 
+        mv.setViewName("childrenPrivacyPolicy");
 
+        return mv;
 
+    }
 
+
 
 
 
 }
 
 }

+ 10 - 0
fs-user-app/src/main/java/com/fs/app/controller/store/H5ScrmController.java
Просмотреть файл 

@@ -102,6 +102,16 @@ public class H5ScrmController
 
         //return R.ok().put("vipService", config.getVipService());
 
         //return R.ok().put("vipService", config.getVipService());
 
         return mv;
 
         return mv;
 
     }
 
     }
 
+    @GetMapping("/childrenPrivacyPolicy")
 
+    public ModelAndView childrenPrivacyPolicy( )
 
+    {
 
+        String json=configService.selectConfigByKey("his.agreementConfig");
 
+        AgreementConfig config= JSONUtil.toBean(json, AgreementConfig.class);
 
+        ModelAndView mv=new ModelAndView();
 
+        mv.addObject("childrenPrivacyPolicy", config.getChildrenPrivacyPolicy());
 
+        mv.setViewName("childrenPrivacyPolicy");
 
+        return mv;
 
+    }
 
 
 
 
 
 }
 
 }

+ 21 - 0
fs-user-app/src/main/resources/templates/childrenPrivacyPolicy.html
Просмотреть файл 

@@ -0,0 +1,21 @@
 
+<!DOCTYPE html>
 
+<html xmlns="http://www.w3.org/1999/xhtml"
 
+      xmlns:th="http://www.thymeleaf.org">
 
+<head>
 
+    <meta charset="UTF-8">
 
+    <meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
 
+    <title >儿童隐私保护协议</title>
 
+    <link  rel="stylesheet"/>
 
+    <style>
 
+        body{
 
+            background-color:#F8F8F8;
 
+        }
 
+    </style>
 
+<body>
 
+<div th:utext="${childrenPrivacyPolicy}" ></div>
 
+<script th:inline="javascript">
 
+
 
+</script>
 
+
 
+</body>
 
+</html>