update:app领取积分奖励

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

@@ -1520,7 +1520,7 @@ public class FsUserCourseVideoServiceImpl extends ServiceImpl<FsUserCourseVideoM
             CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
 
             //服务号授权的，缺mpOpenId的重新登录
-            if (config.getMiniAppAuthType() == 2 && StringUtil.strIsNullOrEmpty(user.getMpOpenId())) {
+            if (param.getSource() != 3 && config.getMiniAppAuthType() == 2 && StringUtil.strIsNullOrEmpty(user.getMpOpenId())) {
                 return R.error(401, "授权后可继续！");
             }
 

fs-user-app/src/main/java/com/fs/app/controller/course/CourseFsUserController.java

@@ -16,6 +16,7 @@ import com.fs.common.core.domain.model.LoginUser;
 import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.CloudHostUtils;
 import com.fs.common.utils.SecurityUtils;
+import com.fs.common.utils.StringUtils;
 import com.fs.course.dto.BatchSendCourseDTO;
 import com.fs.course.param.*;
 import com.fs.course.param.newfs.FsUserCourseAddCompanyUserParam;
@@ -39,6 +40,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 import java.util.HashMap;
 import java.util.Map;
@@ -158,12 +160,18 @@ public class CourseFsUserController extends AppBaseController {
     @PostMapping("/sendReward")
     @UserOperationLog(operationType = FsUserOperationEnum.SENDREWARD)
     @RepeatSubmit
-    public R sendReward(@RequestBody FsCourseSendRewardUParam param)
+    public R sendReward(@RequestBody FsCourseSendRewardUParam param, HttpServletRequest request)
     {
         if (ObjectUtil.isEmpty(param.getUserId())){
             Long userId = Long.parseLong(getUserId());
             param.setUserId(userId);
         }
+        String sourceType = request.getHeader("sourcetype");
+        if(StringUtils.isNotBlank(sourceType)){
+            if ("APP".equals(sourceType)) {
+                param.setSource(3);
+            }
+        }
         logger.info("zyp \n【发放奖励】2：{}",param);
         return courseVideoService.sendRewardByFsUser(param);
     }

fs-user-app/src/main/java/com/fs/app/controller/course/CourseQwController.java

@@ -326,8 +326,14 @@ public class CourseQwController extends AppBaseController {
     @PostMapping("/sendReward")
     @RepeatSubmit
     @UserOperationLog(operationType = FsUserOperationEnum.SENDREWARD)
-    public R sendReward(@RequestBody @Valid FsCourseSendRewardUParam param)
+    public R sendReward(@RequestBody @Valid FsCourseSendRewardUParam param,HttpServletRequest request)
     {
+        String sourceType = request.getHeader("sourcetype");
+        if(StringUtils.isNotBlank(sourceType)){
+            if ("APP".equals(sourceType)) {
+                param.setSource(3);
+            }
+        }
         param.setUserId(Long.parseLong(getUserId()));
         logger.info("【发放奖励】3：{}",param);
         return courseVideoService.sendReward(param);

fs-user-app/src/main/java/com/fs/app/controller/store/CourseH5ScrmController.java

@@ -156,8 +156,14 @@ public class CourseH5ScrmController extends AppBaseController {
     @ApiOperation("发放奖励")
     @PostMapping("/sendReward")
     @RepeatSubmit
-    public R sendReward(@RequestBody FsCourseSendRewardUParam param)
+    public R sendReward(@RequestBody FsCourseSendRewardUParam param,HttpServletRequest request)
     {
+        String sourceType = request.getHeader("sourcetype");
+        if(StringUtils.isNotBlank(sourceType)){
+            if ("APP".equals(sourceType)) {
+                param.setSource(3);
+            }
+        }
         param.setUserId(Long.parseLong(getUserId()));
         logger.info("【发放奖励】4：{}",param);
         return courseVideoService.sendReward(param);

fs-user-app/src/main/java/com/fs/app/controller/store/CourseScrmController.java

@@ -435,8 +435,14 @@ public class CourseScrmController extends AppBaseController {
     @ApiOperation("发放奖励")
     @PostMapping("/sendReward")
     @RepeatSubmit
-    public R sendReward(@RequestBody FsCourseSendRewardUParam param)
+    public R sendReward(@RequestBody FsCourseSendRewardUParam param,HttpServletRequest request)
     {
+        String sourceType = request.getHeader("sourcetype");
+        if(StringUtils.isNotBlank(sourceType)){
+            if ("APP".equals(sourceType)) {
+                param.setSource(3);
+            }
+        }
         param.setUserId(Long.parseLong(getUserId()));
         logger.info("zyp \n【发放奖励】5：{}",param);
         return courseVideoService.sendReward(param);