Merge branch 'develop'

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/ims
-  newTag: be3a62a563f7f863a03f934bdae13531d5c16e47
+  newTag: 8ff2ca9c36e2addec171e452246841c5077766a2

release-service/src/main/java/com/mmc/csf/release/controller/FlyerTrainingController.java

@@ -3,6 +3,7 @@ package com.mmc.csf.release.controller;
 import com.mmc.csf.common.util.date.TDateUtil;
 import com.mmc.csf.common.util.math.CodeUtil;
 import com.mmc.csf.common.util.web.ResultBody;
+import com.mmc.csf.release.auth.dto.LoginSuccessDTO;
 import com.mmc.csf.release.entity.curriculum.CurriculumInfoDO;
 import com.mmc.csf.release.entity.curriculum.CurriculumOrderDO;
 import com.mmc.csf.release.entity.curriculum.CurriculumOrderQO;
@@ -105,7 +106,10 @@ public class FlyerTrainingController extends BaseController {
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CurriculumInfoVO.class)})
     @GetMapping("/curriculumDetails")
     public ResultBody curriculumDetails(HttpServletRequest request, @ApiParam(value = "课程id") @RequestParam(value = "id") Integer id) {
-        return flyerTrainingService.curriculumDetails(id, this.getUserLoginInfoFromRedis(request).getUserAccountId());
+        LoginSuccessDTO userLoginInfoFromRedis = this.getUserLoginInfoFromRedis(request);
+        //没带token访问课程视频详情中的buy就是false， userId = 0 会使buy为false
+        Integer userId = userLoginInfoFromRedis == null ? 0 : userLoginInfoFromRedis.getUserAccountId();
+        return flyerTrainingService.curriculumDetails(id, userId);
     }
 
     @ApiOperation(value = "V1.0.1新增课程")

release-service/src/main/resources/not-check.yml

@@ -45,4 +45,5 @@ data-filter:
     - /release/dynamic/dynamicDetails
     - /release/gambit/allCommentList
     - /release/dynamic/appGambitList
+    - /release/curriculum/curriculumDetails