3 Commits 20e480b1d8 ... 6a6c2a6682

Author SHA1 Message Date
  xgb 6a6c2a6682 Merge remote-tracking branch 'origin/Payment-Configuration' into Payment-Configuration 3 weeks ago
  xgb 5fb63af509 查询最新看课记录 3 weeks ago
  xgb 3ab2e9c1af 积分是否领取 成功 3 weeks ago

+ 2 - 2
fs-service/src/main/java/com/fs/his/service/impl/FsUserIntegralLogsServiceImpl.java

@@ -536,10 +536,10 @@ public class FsUserIntegralLogsServiceImpl implements IFsUserIntegralLogsService
         }
 
         // 是否首次下载App
-        Integer isFinishDownloadAppIntegral=0;
+        int isFinishDownloadAppIntegral=0;
         integralLogs = fsUserIntegralLogsMapper.selectFsUserIntegralLogsByUserIdAndLogType(userId, FsUserIntegralLogTypeEnum.TYPE_28.getValue(), null);
         if (!integralLogs.isEmpty()) {
-            isFinishConsultation = 1;
+            isFinishDownloadAppIntegral = 1;
         }
 
 

+ 1 - 3
fs-service/src/main/resources/mapper/course/FsCourseWatchLogMapper.xml

@@ -1240,9 +1240,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select c.course_name courseName,c.img_url imgUrl,r.title videoName,l.link_id linkId,l.duration,l.video_id videoId,l.user_id userId,l.company_user_id companyUserId  from fs_course_watch_log l
         left join fs_user_course c on l.course_id =c.course_id
         left join fs_user_course_video r on r.video_id=l.video_id
-        WHERE l.user_id = #{userId}
-          and l.create_time >= CONCAT(CURDATE(), ' 00:00:00')
-          and l.create_time <= CONCAT(CURDATE(), ' 23:59:59')
+        WHERE l.user_id = #{userId} and l.update_time is not null
          order by l.update_time DESC LIMIT 1
     </select>