Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_his_scrm_java

fs-service/src/main/java/com/fs/course/mapper/FsUserCourseVideoRedPackageMapper.java

@@ -66,6 +66,7 @@ public interface FsUserCourseVideoRedPackageMapper
      * @return 结果
      */
     public int deleteFsUserCourseVideoRedPackageByIds(Long[] ids);
+    public int deleteFsUserCourseVideoRedPackageByVedioIds(Long[] ids);
     @Update("INSERT INTO fs_user_course_video_red_package (company_id, video_id, red_packet_money) " +
             "VALUES (#{companyId}, #{videoId}, #{redPacketMoney}) " +
             "ON DUPLICATE KEY UPDATE red_packet_money = VALUES(red_packet_money);")

fs-service/src/main/java/com/fs/course/service/impl/FsUserCoursePeriodDaysServiceImpl.java

@@ -133,7 +133,7 @@ public class FsUserCoursePeriodDaysServiceImpl extends ServiceImpl<FsUserCourseP
         if(!periodDayIds.isEmpty()){
             flag = fsUserCoursePeriodDaysMapper.updateBatchDelFlag(periodDayIds.toArray(new Long[0]),1);
             //删除红包记录
-            fsUserCourseVideoRedPackageMapper.updateBatchDelFlag(videoIds.toArray(new Long[0]),1);
+            fsUserCourseVideoRedPackageMapper.deleteFsUserCourseVideoRedPackageByVedioIds(videoIds.toArray(new Long[0]));
         }
         return flag;
     }

fs-service/src/main/resources/mapper/course/FsUserCourseVideoRedPackageMapper.xml

@@ -63,7 +63,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
-
+    <delete id="deleteFsUserCourseVideoRedPackageByVedioIds" parameterType="String">
+        delete from fs_user_course_video_red_package where video_id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
     <!-- 批量查询匹配的红包数据 -->
     <select id="selectByParamsList" resultMap="FsUserCourseVideoRedPackageResult">
         select id, company_id, video_id, red_packet_money, period_id, data_type

fs-user-app/src/main/java/com/fs/app/controller/AdvController.java

@@ -26,7 +26,7 @@ public class AdvController {
 	@Autowired
 	private IFsAdvService advService;
 
-	@Cacheable(value="getAdvList", key="#map")
+//	@Cacheable(value="getAdvList", key="#map")
 	@ApiOperation("获取首页广告位")
 	@GetMapping("/getAdvList")
 	public R getAdvList(FsAdvUParam map){

fs-user-app/src/main/java/com/fs/app/controller/CommonController.java

@@ -603,6 +603,4 @@ public class CommonController {
 		return R.error("获取域名失败，请检查后台配置！");
 	}
 
-
-
 }

fs-user-app/src/main/java/com/fs/app/controller/CourseController.java

@@ -47,7 +47,7 @@ public class CourseController extends  AppBaseController{
     private IFsCourseSopAppLinkService courseSopAppLinkService;
 
 
-    @Cacheable(value="getCourseCate" )
+//    @Cacheable(value="getCourseCate" )
     @ApiOperation("获取分类")
     @GetMapping("/getCourseCate")
     public R getCourseCate(){
@@ -70,7 +70,7 @@ public class CourseController extends  AppBaseController{
             return R.error("操作异常");
         }
     }
-    @Cacheable(value = "getCourseList",key = "#param" )
+//    @Cacheable(value = "getCourseList",key = "#param" )
     @ApiOperation("课程列表")
     @GetMapping("/getCourseList")
     public R getCourseList(FsUserCourseListUParam param)