Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_scrm_java

fs-company-app/src/main/java/com/fs/app/controller/QwWorkTaskController.java

@@ -7,6 +7,7 @@ import com.fs.qw.domain.QwWorkTask;
 import com.fs.qw.service.IQwUserService;
 import com.fs.qw.service.IQwWorkTaskService;
 import com.fs.app.param.QwWorkTaskQueryParam;
+import com.fs.qw.vo.QwOptionsVO;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
@@ -15,6 +16,7 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
@@ -52,9 +54,12 @@ public class QwWorkTaskController extends AppBaseController {
     @Login
     @ApiOperation("销售下的企微用户")
     @GetMapping("/getMyQwUserList")
-    public R userList() {
+    public R userList(@RequestParam(required = false, defaultValue = "1") Integer pageNum,
+                      @RequestParam(required = false, defaultValue = "10") Integer pageSize) {
         Long userId = Long.parseLong(getUserId());
-        return R.ok().put("data", qwUserService.selectQwUserListOptionsVOByCompanyUserId(userId));
+        PageHelper.startPage(pageNum, pageSize);
+        List<QwOptionsVO> list = qwUserService.selectQwUserListOptionsVOByCompanyUserId(userId);
+        return R.ok().put("data", new PageInfo<>(list));
     }
 
 }

fs-qwhook/src/main/java/com/fs/app/controller/AppBaseController.java

@@ -1,54 +0,0 @@
-package com.fs.app.controller;
-
-
-import com.fs.app.exception.FSException;
-import com.fs.app.utils.JwtUtils;
-import com.fs.common.core.redis.RedisCache;
-import com.fs.common.utils.ServletUtils;
-import com.fs.company.domain.CompanyUser;
-import com.fs.company.service.ICompanyUserService;
-import com.fs.store.domain.FsUser;
-import com.fs.store.service.IFsUserService;
-import io.jsonwebtoken.Claims;
-import org.springframework.beans.factory.annotation.Autowired;
-
-
-public class AppBaseController {
-	@Autowired
-	JwtUtils jwtUtils;
-	@Autowired
-	RedisCache redisCache;
-
-	@Autowired
-	private ICompanyUserService companyUserService;
-	@Autowired
-	private IFsUserService userService;
-	public Long getCompanyId() {
-		String headValue =  ServletUtils.getRequest().getHeader("APPToken");
-		Claims claims=jwtUtils.getClaimByToken(headValue);
-		String userId = claims.getSubject().toString();
-		Long companyId =(Long)redisCache.getCacheObject("companyId:"+userId);
-		return companyId;
-	}
-	public String getUserId()
-	{
-		String headValue =  ServletUtils.getRequest().getHeader("APPToken");
-		Claims claims=jwtUtils.getClaimByToken(headValue);
-		String userId = claims.getSubject().toString();
-		return userId;
-	}
-	//获取商城手机号
-	public Long getUserId(Long companyUserId)
-	{
-		CompanyUser companyUser=companyUserService.selectCompanyUserById(companyUserId);
-		FsUser user=userService.selectFsUserByPhone(companyUser.getPhonenumber());
-		if(user==null){
-			throw new FSException("未授权,请用员工手机号登录商城");
-		}
-		return user.getUserId();
-	}
-
-
-
-
-}

fs-qwhook/src/main/java/com/fs/app/controller/FsUserCourseVideoController.java

@@ -34,7 +34,7 @@ import java.util.List;
 @RestController
 @RequestMapping("/app/fs/course")
 @Slf4j
-public class FsUserCourseVideoController extends AppBaseController {
+public class FsUserCourseVideoController {
 
     @Autowired
     private IFsUserCourseVideoService fsUserCourseVideoService;
@@ -53,7 +53,7 @@ public class FsUserCourseVideoController extends AppBaseController {
             return ResponseResult.fail(500,"无权限");
         }
         PageHelper.startPage(param.getPageNum(), param.getPageSize());
-        param.setCompanyId(getCompanyId());
+        param.setCompanyId(qwUser.getCompanyId());
         List<FsUserCourseVideoPageListVO> list = fsUserCourseVideoService.pageListCourseVideo(param);
         PageInfo<FsUserCourseVideoPageListVO> pageInfo = new PageInfo<>(list);
         return ResponseResult.ok(pageInfo);
@@ -73,7 +73,7 @@ public class FsUserCourseVideoController extends AppBaseController {
             return ResponseResult.fail(500,"无权限");
         }
         PageHelper.startPage(param.getPageNum(), param.getPageSize());
-        param.setCompanyId(getCompanyId());
+        param.setCompanyId(qwUser.getCompanyId());
         List<FsUserCourseListVO> fsUserCourseList = fsUserCourseService.getFsUserCourseList(param);
         PageInfo<FsUserCourseListVO> pageInfo = new PageInfo<>(fsUserCourseList);
         return ResponseResult.ok(pageInfo);
@@ -87,7 +87,7 @@ public class FsUserCourseVideoController extends AppBaseController {
             return ResponseResult.fail(500,"无权限");
         }
         PageHelper.startPage(param.getPageNum(), param.getPageSize());
-        param.setCompanyId(getCompanyId());
+        param.setCompanyId(qwUser.getCompanyId());
         List<FsUserVideoListVO> listCourseVideo = fsUserCourseVideoService.getListCourseVideo(param);
         PageInfo<FsUserVideoListVO> result = new PageInfo<>(listCourseVideo);
         return ResponseResult.ok(result);

fs-service-system/src/main/java/com/fs/course/config/CourseConfig.java

@@ -14,6 +14,8 @@ public class CourseConfig implements Serializable {
     private Integer answerIntegral;//答题获得积分
     private Integer defaultLine;//默认看课线路
     private String realLinkDomainName;//真链域名
+    private String authDomainName;//网页授权域名
+    private String mpAppId;//看课公众号APPID
     private String registerDomainName;//注册域名
     private String courseDomainName;//链接域名
     private Integer rewardType; // 奖励类型 1红包 2积分

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

@@ -22,6 +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:小程序
+    private Integer isRoom;
 
 }

fs-service-system/src/main/java/com/fs/course/param/FsUserCourseVideoFinishUParam.java

@@ -19,4 +19,5 @@ public class FsUserCourseVideoFinishUParam implements Serializable {
     private String uuId;
     private Long qwExternalId;
     private Integer linkType;
+    private Integer isRoom;
 }

fs-service-system/src/main/java/com/fs/course/service/impl/FsCourseLinkServiceImpl.java

@@ -382,14 +382,15 @@ public class FsCourseLinkServiceImpl implements IFsCourseLinkService
                         return R.error("真实链接不存在").put("realLink", sLink);
                     }
                     log.info("链接仍然有效: {}", sLink);
+                    String json = configService.selectConfigByKey("course.config");
+                    CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
                     String domainName = companyUserMapper.selectDomainByUserId(courseLink.getCompanyUserId());
                     if (StringUtils.isEmpty(domainName)){
-                        String json = configService.selectConfigByKey("course.config");
-                        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
                         domainName = config.getRealLinkDomainName();
                     }
                     String realLink = domainName+courseLink.getRealLink();
-                    return R.ok().put("realLink",realLink );
+                    String imgUrl = "";
+                    return R.ok().put("realLink",realLink ).put("config",config).put("headerImg",imgUrl);
                 }
             } else {
                 // 链接不存在或解析失败

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

@@ -290,6 +290,10 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
             return R.ok();
         }
 
+        if (param.getIsRoom()!=null&&param.getIsRoom()==1&&param.getQwExternalId()==null){
+            return R.ok();
+        }
+
         // 从Redis中获取观看时长
         String redisKey = "h5user:watch:duration:" + param.getQwUserId()+ ":" + param.getQwExternalId() + ":" + param.getVideoId();
         try {
@@ -377,7 +381,7 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
         log.setSendType(2);
         log.setDuration(0L);
         log.setCreateTime(new Date());
-        log.setLogType(0);
+        log.setLogType(3);
         courseWatchLogMapper.insertFsCourseWatchLog(log);
     }
 
@@ -451,8 +455,14 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
             FsUser user = new FsUser();
             user.setUserId(param.getUserId());
             user.setIsAddQw(1);
+            user.setQwExtId(param.getQwExternalId());
             fsUserMapper.updateFsUser(user);
 
+            List<String> list= sopUserLogsInfoMapper.selectSopUserLogsInfoByExtId(contact.getId());
+            if (list!=null&& !list.isEmpty()){
+                sopUserLogsInfoMapper.updateSopUserLogsInfoFsUserIdById(list,param.getUserId());
+            }
+
             //绑定上之后 更新观看记录
             //看课记录中userId为0绑定userId
             if (log.getUserId()==null||log.getUserId().equals(0L) || !log.getUserId().equals(param.getUserId())){

fs-user-app/src/main/java/com/fs/app/controller/CourseController.java

@@ -8,6 +8,7 @@ import com.fs.common.core.domain.R;
 import com.fs.common.utils.DateUtils;
 import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.StringUtils;
+import com.fs.core.utils.OrderCodeUtils;
 import com.fs.course.config.CourseConfig;
 import com.fs.course.domain.*;
 import com.fs.course.param.*;
@@ -360,12 +361,19 @@ public class CourseController extends  AppBaseController{
         long tipsTime = 0L;
         int isFinish = 0;
         if (param.getLinkType()!=null&&param.getLinkType()==1){
-            return R.ok().put("course",course).put("questions",questionVOList).put("config",config).put("playDuration",duration).put("tipsTime",tipsTime).put("maxBufferLength",config.getMaxBufferLength());
+            return R.ok().put("course",course).put("questions",questionVOList).put("config",config).put("playDuration",duration).put("tipsTime",tipsTime);
+        }
+
+        if (param.getIsRoom()!=null&&param.getIsRoom()==1&&param.getQwExternalId()==null){
+            return R.ok().put("course",course).put("questions",questionVOList).put("config",config).put("playDuration",duration).put("tipsTime",tipsTime);
         }
         // 从Redis中获取观看时长
         String redisKey = "h5user:watch:duration:" + param.getQwUserId()+ ":" + param.getQwExternalId() + ":" + param.getVideoId();
         String durationStr = redisCache.getCacheObject(redisKey);
         FsCourseWatchLog log = courseWatchLogService.getWatchCourseVideo(param.getUserId(),param.getVideoId(),param.getQwUserId(),param.getQwExternalId());
+        if (log==null){
+            return R.error("记录不存在，请联系客服!");
+        }
         //redis取不到查库
         if (durationStr != null) {
             duration = Long.parseLong(durationStr);
@@ -378,7 +386,7 @@ public class CourseController extends  AppBaseController{
         }
         //判断是否完课
         if (log.getLogType()==2){
-           isFinish=1;
+            isFinish=1;
         }
 
         //将视频时长也存到redis
@@ -389,7 +397,7 @@ public class CourseController extends  AppBaseController{
         }
 
 
-        return R.ok().put("course",course).put("questions",questionVOList).put("config",config).put("playDuration",duration).put("tipsTime",tipsTime).put("maxBufferLength",config.getMaxBufferLength()).put("isFinish",isFinish);
+        return R.ok().put("course",course).put("questions",questionVOList).put("config",config).put("playDuration",duration).put("tipsTime",tipsTime).put("isFinish",isFinish);
     }
 
 
@@ -454,16 +462,7 @@ public class CourseController extends  AppBaseController{
         param.setUserId(userId);
         return courseVideoService.isAddKf(param);
     }
-    @Login
-    @ApiOperation("注册看课")
-    @PostMapping("/registerCourse")
-    public R register(@RequestBody FsUserCourseRegisterParam param) {
-        Long userId = Long.parseLong(getUserId());
 
-        param.setUserId(userId);
-        logger.info("小程序用户Id:"+param.getUserId());
-        return courseVideoService.registerCourse(param);
-    }
     @Login
     @ApiOperation("获取缓冲流量")
     @PostMapping("/getInternetTraffic")