直播代码合并 报错修复

fs-company/src/main/java/com/fs/framework/service/UserDetailsServiceImpl.java

@@ -10,7 +10,6 @@ import com.fs.company.domain.CompanyUser;
 import com.fs.company.service.ICompanyService;
 import com.fs.company.service.ICompanyUserService;
 import com.fs.framework.security.LoginUser;
-import com.fs.framework.security.SecurityUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

fs-company/src/main/java/com/fs/hisStore/utils/CityTreeUtil.java

@@ -1,4 +1,4 @@
-package com.fs.store.utils;
+package com.fs.hisStore.utils;
 import com.fs.store.vo.CityVO;
 import org.springframework.util.CollectionUtils;
 

fs-qw-task/src/main/java/com/fs/FsQwTaskApplication.java

@@ -13,7 +13,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
 @EnableTransactionManagement
 @EnableAsync
-//@EnableScheduling
+@EnableScheduling
 public class FsQwTaskApplication
 {
     public static void main(String[] args){

fs-service/src/main/java/com/fs/ipad/vo/BaseVo.java

@@ -12,7 +12,6 @@ public class BaseVo{
     private Long serverId;
     private List<String> exIdList;
     private String exId;
-    private List<String> exIdList;
     private String corpId;
     private String corpCode;
     private boolean isRoom;

fs-service/src/main/java/com/fs/live/service/impl/LiveRedConfServiceImpl.java

@@ -8,6 +8,7 @@ import com.fs.common.constant.LiveKeysConstant;
 import com.fs.common.core.domain.R;
 import com.fs.common.core.redis.RedisCache;
 import com.fs.common.utils.DateUtils;
+import com.fs.his.mapper.FsUserMapper;
 import com.fs.his.service.IFsUserService;
 import com.fs.live.domain.*;
 import com.fs.live.mapper.LiveMapper;
@@ -48,7 +49,7 @@ public class LiveRedConfServiceImpl implements ILiveRedConfService {
     private RedisCache redisCache;
 
     @Autowired
-    private IFsUserService userService;
+    private FsUserMapper userService;
     @Autowired
     private LiveMapper liveMapper;
     @Autowired
@@ -297,7 +298,7 @@ public class LiveRedConfServiceImpl implements ILiveRedConfService {
                         .collect(Collectors.toList());
                 userRedRecordMapper.insertLiveUserRedRecordBatch(liveUserRedRecords);
                 for (LiveUserRedRecord liveUserRedRecord : liveUserRedRecords) {
-                    userService.increaseIntegral(Collections.singletonList(liveUserRedRecord.getUserId()), liveUserRedRecord.getIntegral());
+                    userService.incrIntegral(Collections.singletonList(liveUserRedRecord.getUserId()), liveUserRedRecord.getIntegral());
                     // 保存用户领取芳华币记录 方便统计计算
                     saveUserRewardRecord(liveUserRedRecord);
                 }

fs-service/src/main/java/com/fs/live/service/impl/LiveVideoServiceImpl.java

@@ -175,4 +175,9 @@ public class LiveVideoServiceImpl implements ILiveVideoService
         return null;
     }
 
+    @Override
+    public void updateFinishStatus(String string) {
+        liveVideoMapper.updateFinishStatus(string);
+    }
+
 }

fs-service/src/main/java/com/fs/qw/domain/QwExternalContact.java

@@ -150,7 +150,5 @@ public class QwExternalContact extends BaseEntity
     // 是否被邀请进群0否1是
     private Integer joinGroup;
 
-    // 是否被邀请进群0否1是
-    private Integer joinGroup;
 
 }

fs-service/src/main/java/com/fs/qw/service/impl/AsyncChatSopService.java

@@ -31,12 +31,8 @@ public class AsyncChatSopService {
     // 每个人一次性最大创建群聊次数
     public final static Integer MAX_GROUP_NUM = 3;
     // 一个群一天最大拉群人数量
-    public final static Integer MAX_GROUP_USER_NUM = 40;
+    public final static Integer MAX_GROUP_USER_NUM = 39;
 
-    // 每个人一次性最大创建群聊次数
-    public final static Integer MAX_GROUP_NUM = 3;
-    // 一个群一天最大拉群人数量
-    public final static Integer MAX_GROUP_USER_NUM = 40;
 
     private final QwSopMapper qwSopMapper;
     private final QwSopTempMapper qwSopTempMapper;

fs-service/src/main/java/com/fs/qw/service/impl/QwExternalContactServiceImpl.java

@@ -5977,17 +5977,4 @@ public class QwExternalContactServiceImpl extends ServiceImpl<QwExternalContactM
     }
 
 
-    @Override
-    public List<QwExternalContact> selectQwUserAndLevel(List<Long> qwUserIdList, List<String> levelList, boolean isReg) {
-        QueryWrapper<QwExternalContact> queryCondition = new QueryWrapper<QwExternalContact>().isNotNull(isReg, "fs_user_id").eq("status", 0).eq("join_group", 0)
-                .in("qw_user_id", qwUserIdList).and(qw->{
-                    qw.in("level", levelList);
-                    if(levelList.contains("-1")) {
-                        qw.or().isNull("level");
-                    }
-                    return qw;
-                });
-
-        return list(queryCondition);
-    }
 }