|
@@ -2,12 +2,15 @@ package com.fs.app.controller.course;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
+import cn.hutool.core.util.ObjectUtil;
|
|
import com.fs.app.annotation.UserOperationLog;
|
|
import com.fs.app.annotation.UserOperationLog;
|
|
import com.fs.app.controller.AppBaseController;
|
|
import com.fs.app.controller.AppBaseController;
|
|
import com.fs.common.annotation.RepeatSubmit;
|
|
import com.fs.common.annotation.RepeatSubmit;
|
|
import com.fs.common.core.domain.R;
|
|
import com.fs.common.core.domain.R;
|
|
import com.fs.common.core.domain.ResponseResult;
|
|
import com.fs.common.core.domain.ResponseResult;
|
|
import com.fs.app.annotation.Login;
|
|
import com.fs.app.annotation.Login;
|
|
|
|
+import com.fs.common.core.domain.model.LoginUser;
|
|
|
|
+import com.fs.common.utils.SecurityUtils;
|
|
import com.fs.course.param.FsCourseQuestionAnswerUParam;
|
|
import com.fs.course.param.FsCourseQuestionAnswerUParam;
|
|
import com.fs.course.param.FsCourseSendRewardUParam;
|
|
import com.fs.course.param.FsCourseSendRewardUParam;
|
|
import com.fs.course.param.FsUserCourseVideoFinishUParam;
|
|
import com.fs.course.param.FsUserCourseVideoFinishUParam;
|
|
@@ -53,8 +56,10 @@ public class CourseFsUserController extends AppBaseController {
|
|
@ApiOperation("判断是否添加客服(是否关联销售)")
|
|
@ApiOperation("判断是否添加客服(是否关联销售)")
|
|
@PostMapping("/isAddKf")
|
|
@PostMapping("/isAddKf")
|
|
public ResponseResult<FsUser> isAddCompanyUser(@Valid @RequestBody FsUserCourseAddCompanyUserParam param) {
|
|
public ResponseResult<FsUser> isAddCompanyUser(@Valid @RequestBody FsUserCourseAddCompanyUserParam param) {
|
|
- Long userId = Long.parseLong(getUserId());
|
|
|
|
- param.setUserId(userId);
|
|
|
|
|
|
+ if (ObjectUtil.isEmpty(param.getUserId())){
|
|
|
|
+ Long userId = Long.parseLong(getUserId());
|
|
|
|
+ param.setUserId(userId);
|
|
|
|
+ }
|
|
return courseVideoService.isAddCompanyUser(param);
|
|
return courseVideoService.isAddCompanyUser(param);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -103,7 +108,10 @@ public class CourseFsUserController extends AppBaseController {
|
|
@PostMapping("/courseAnswer")
|
|
@PostMapping("/courseAnswer")
|
|
@UserOperationLog(operationType = FsUserOperationEnum.ANSWER)
|
|
@UserOperationLog(operationType = FsUserOperationEnum.ANSWER)
|
|
public R courseAnswer(@RequestBody FsCourseQuestionAnswerUParam param){
|
|
public R courseAnswer(@RequestBody FsCourseQuestionAnswerUParam param){
|
|
- param.setUserId(Long.parseLong(getUserId()));
|
|
|
|
|
|
+ if (ObjectUtil.isEmpty(param.getUserId())){
|
|
|
|
+ Long userId = Long.parseLong(getUserId());
|
|
|
|
+ param.setUserId(userId);
|
|
|
|
+ }
|
|
logger.info("zyp \n【答题】:{}",param.getQuestions());
|
|
logger.info("zyp \n【答题】:{}",param.getQuestions());
|
|
if (param.getDuration()==null){
|
|
if (param.getDuration()==null){
|
|
logger.info("zyp \n【未识别到时长】:{}",param.getUserId());
|
|
logger.info("zyp \n【未识别到时长】:{}",param.getUserId());
|
|
@@ -117,7 +125,10 @@ public class CourseFsUserController extends AppBaseController {
|
|
@RepeatSubmit
|
|
@RepeatSubmit
|
|
public R sendReward(@RequestBody FsCourseSendRewardUParam param)
|
|
public R sendReward(@RequestBody FsCourseSendRewardUParam param)
|
|
{
|
|
{
|
|
- param.setUserId(Long.parseLong(getUserId()));
|
|
|
|
|
|
+ if (ObjectUtil.isEmpty(param.getUserId())){
|
|
|
|
+ Long userId = Long.parseLong(getUserId());
|
|
|
|
+ param.setUserId(userId);
|
|
|
|
+ }
|
|
logger.info("zyp \n【发放奖励】:{}",param);
|
|
logger.info("zyp \n【发放奖励】:{}",param);
|
|
return courseVideoService.sendRewardByFsUser(param);
|
|
return courseVideoService.sendRewardByFsUser(param);
|
|
}
|
|
}
|