fs-service/src/main/java/com/fs/course/domain/FsUserCoursePeriodDays.java

@@ -96,6 +96,7 @@ public class FsUserCoursePeriodDays extends BaseEntityTow {
     private LocalDate maxDate;
 
     /** 项目id */
+    @TableField(exist = false)
     private Long projectId;
 
 }

fs-service/src/main/java/com/fs/course/param/FsCourseSendRewardUParam.java

@@ -22,7 +22,7 @@ public class FsCourseSendRewardUParam implements Serializable
     private String corpId;
     private Integer linkType;
     private Long qwExternalId;
-    private Integer source=1;//来源 1:h5  2:小程序
+    private Integer source=1;//来源 1:h5  2:小程序 3：app
     private Integer isRoom;
     private Integer sendType;
     private Long periodId;

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

@@ -966,6 +966,12 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
         String json = configService.selectConfigByKey("course.config");
         CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
 
+        // 判断来源是否是app，如是app，则发放积分奖励
+        int sourceApp = 3;
+        if(sourceApp == param.getSource()){
+            return sendIntegralReward(param, user, log, config);
+        }
+
         // 根据奖励类型发放不同奖励
         switch (config.getRewardType()) {
             // 红包奖励
@@ -1585,11 +1591,12 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
             return ResponseResult.fail(504, "请观看最新的课程项目");
         }
         // 项目看课数限制
-        Integer logCount = fsUserCourseMapper.selectTodayCourseWatchLogCountByUserIdAndProjectId(param.getUserId(), param.getProjectId());
-        if (Objects.isNull(watchCourseVideo) && logCount > 0) {
-            return ResponseResult.fail(504, "超过项目看课数量限制");
+        if(!"福本源".equals(signProjectName)) {
+            Integer logCount = fsUserCourseMapper.selectTodayCourseWatchLogCountByUserIdAndProjectId(param.getUserId(), param.getProjectId());
+            if (Objects.isNull(watchCourseVideo) && logCount > 0) {
+                return ResponseResult.fail(504, "超过项目看课数量限制");
+            }
         }
-
         //添加判断：该用户是否已经存在此课程的看课记录，并且看课记录的销售id不是传入的销售id
         if(watchCourseVideo != null){
             if(!watchCourseVideo.getCompanyUserId().equals(param.getCompanyUserId())) {

fs-service/src/main/java/com/fs/sop/service/impl/QwSopTempServiceImpl.java

@@ -398,6 +398,10 @@ public class QwSopTempServiceImpl implements IQwSopTempService
                     rules.setIsOfficial("0");
                 }
 
+                if (day.getDayNum()==1){
+                    rules.setTime("01:05");
+                }
+
                 rules.setTime(time);
                 rules.setContentType(2);
                 rules.setType(2);

fs-service/src/main/resources/mapper/company/CompanyUserMapper.xml

@@ -518,9 +518,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{companyUserId}
         </foreach>
     </select>
-    <select id="selectCompanyUserByCompanyUserId" resultMap="CompanyUserResult">
-        select  * from company_user where user_id = #{companyUserId}
-    </select>
     <update id="batchUpdateUserDomain">
         update company_user set domain=#{domain} where user_id in <foreach collection="ids"  item="item" index="index" open="(" separator="," close=")">#{item}</foreach>
     </update>

fs-service/src/main/resources/mapper/his/FsDoctorMapper.xml

@@ -124,13 +124,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </select>
 
-    <select id="selectDoctorNameByIds" resultType="java.lang.String">
-        select GROUP_CONCAT(DISTINCT doctor_name ORDER BY doctor_name SEPARATOR ',') AS doctor_name from fs_doctor where doctor_id in
-        <foreach collection="doctorIds.split(',')" item="doctorId" open="(" close=")" separator=",">
-            #{doctorId}
-        </foreach>
-    </select>
-
     <insert id="insertFsDoctor" parameterType="FsDoctor" useGeneratedKeys="true" keyProperty="doctorId">
         insert into fs_doctor
         <trim prefix="(" suffix=")" suffixOverrides=",">