Merge branch 'refs/heads/master' into ScrmStore

fs-admin/src/main/java/com/fs/api/controller/IndexStatisticsController.java

@@ -64,6 +64,9 @@ public class IndexStatisticsController {
     @GetMapping("/trafficLog")
     public R getTrafficLog(){
         TrafficLogDTO trafficLogDTO = redisCache.getCacheObject(DATA_OVERVIEW_TRAFFIC_LOG);
+        if(trafficLogDTO == null) {
+            return null;
+        }
         SysConfig sysConfig = sysConfigService.selectConfigByConfigKey("redPacket.Traffic.config");
         String configValue = sysConfig.getConfigValue();
         trafficLogDTO.setTraffic(configValue);

fs-admin/src/main/java/com/fs/course/controller/FsUserCourseVideoController.java

@@ -191,7 +191,13 @@ public class FsUserCourseVideoController extends BaseController
         // 设置项目ID
         FsUserCourse fsUserCourse = fsUserCourseService.selectFsUserCourseByCourseId(vo.getCourseId());
         vo.setProjectId(fsUserCourse.getProject());
-
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        Long userId = loginUser.getUser().getUserId();
+        String json = configService.selectConfigByKey("course.config");
+        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
+        if (ObjectUtil.isNotEmpty(config.getIsBound())&&config.getIsBound()){
+            vo.setUserId(userId);
+        }
         fsUserCourseVideoService.batchSaveVideo(vo);
         return R.ok();
     }

fs-admin/src/main/java/com/fs/his/controller/FsDoctorArticleCateController.java

@@ -1,7 +1,9 @@
 package com.fs.his.controller;
 
+import java.util.Collection;
 import java.util.List;
 
+import com.fs.common.core.redis.RedisCache;
 import com.fs.his.vo.OptionsVO;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,6 +36,8 @@ public class FsDoctorArticleCateController extends BaseController
 {
     @Autowired
     private IFsDoctorArticleCateService fsDoctorArticleCateService;
+    @Autowired
+    RedisCache redisCache;
 
     /**
      * 查询医生文章分类列表
@@ -78,7 +82,12 @@ public class FsDoctorArticleCateController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody FsDoctorArticleCate fsDoctorArticleCate)
     {
-        return toAjax(fsDoctorArticleCateService.insertFsDoctorArticleCate(fsDoctorArticleCate));
+        int i = fsDoctorArticleCateService.insertFsDoctorArticleCate(fsDoctorArticleCate);
+        Collection<String> keys = redisCache.keys("getDoctorArticleCateList*");
+        for (String key : keys) {
+            redisCache.deleteObject(key);
+        }
+        return toAjax(i);
     }
 
     /**
@@ -89,7 +98,12 @@ public class FsDoctorArticleCateController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody FsDoctorArticleCate fsDoctorArticleCate)
     {
-        return toAjax(fsDoctorArticleCateService.updateFsDoctorArticleCate(fsDoctorArticleCate));
+        int i = fsDoctorArticleCateService.updateFsDoctorArticleCate(fsDoctorArticleCate);
+        Collection<String> keys = redisCache.keys("getDoctorArticleCateList*");
+        for (String key : keys) {
+            redisCache.deleteObject(key);
+        }
+        return toAjax(i);
     }
 
     /**
@@ -100,7 +114,12 @@ public class FsDoctorArticleCateController extends BaseController
 	@DeleteMapping("/{cateIds}")
     public AjaxResult remove(@PathVariable Long[] cateIds)
     {
-        return toAjax(fsDoctorArticleCateService.deleteFsDoctorArticleCateByCateIds(cateIds));
+        int i = fsDoctorArticleCateService.deleteFsDoctorArticleCateByCateIds(cateIds);
+        Collection<String> keys = redisCache.keys("getDoctorArticleCateList*");
+        for (String key : keys) {
+            redisCache.deleteObject(key);
+        }
+        return toAjax(i);
     }
 
     @GetMapping("/allList")

fs-admin/src/main/java/com/fs/his/controller/FsDoctorArticleController.java

@@ -114,6 +114,11 @@ public class FsDoctorArticleController extends BaseController
 	@DeleteMapping("/{articleIds}")
     public AjaxResult remove(@PathVariable Long[] articleIds)
     {
-        return toAjax(fsDoctorArticleService.deleteFsDoctorArticleByArticleIds(articleIds));
+        int i = fsDoctorArticleService.deleteFsDoctorArticleByArticleIds(articleIds);
+        Collection<String> keys = redisCache.keys("getDoctorArticleList*");
+        for (String key : keys) {
+            redisCache.deleteObject(key);
+        }
+        return toAjax(i);
     }
 }

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

@@ -210,6 +210,7 @@ public class CompanyUserController extends AppBaseController {
         companyUser.setIsAudit(0);
         companyUser.setParentId(upCompanyUser.getUserId());
         companyUser.setCompanyId(upCompanyUser.getCompanyId());
+        companyUser.setCompanyId(company.getCompanyId());
 
         // 部门
         CompanyDept dept = companyDeptService.getDefaultCompanyDeptByCompanyId(upCompanyUser.getCompanyId());

fs-company/src/main/java/com/fs/company/controller/store/FsPackageController.java

@@ -9,6 +9,7 @@ import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.his.domain.FsPackage;
 import com.fs.his.param.FsPackageParam;
 import com.fs.his.service.IFsPackageService;
+import com.fs.his.utils.RedisCacheUtil;
 import com.fs.his.vo.FsPackageExcelVO;
 import com.fs.his.vo.FsPackageListVO;
 import com.fs.his.vo.OptionsVO;
@@ -31,6 +32,9 @@ public class FsPackageController extends BaseController
     @Autowired
     private IFsPackageService fsPackageService;
 
+    @Autowired
+    RedisCacheUtil redisCacheUtil;
+
     /**
      * 查询套餐包列表
      */
@@ -71,7 +75,10 @@ public class FsPackageController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody FsPackage fsPackage)
     {
-        return toAjax(fsPackageService.insertFsPackage(fsPackage));
+        int i = fsPackageService.insertFsPackage(fsPackage);
+        redisCacheUtil.delRedisKey("getPackageList");
+        redisCacheUtil.delRedisKey("getPackageById");
+        return toAjax(i);
     }
 
     /**
@@ -82,7 +89,10 @@ public class FsPackageController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody FsPackage fsPackage)
     {
-        return toAjax(fsPackageService.updateFsPackage(fsPackage));
+        int i = fsPackageService.updateFsPackage(fsPackage);
+        redisCacheUtil.delRedisKey("getPackageList");
+        redisCacheUtil.delRedisKey("getPackageById");
+        return toAjax(i);
     }
 
     /**

fs-company/src/main/java/com/fs/user/FsUserAdminController.java

@@ -58,12 +58,13 @@ public class FsUserAdminController extends BaseController {
         //startPage();
 
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        if (param.getIsMyFsUser()){
+       /* if (param.getIsMyFsUser()){
             param.setCompanyId(loginUser.getCompany().getCompanyId());
             param.setCompanyUserId(String.valueOf(loginUser.getUser().getUserId()));
         }else {
             param.setCompanyId(loginUser.getCompany().getCompanyId());
-        }
+        }*/
+        param.setCompanyId(loginUser.getCompany().getCompanyId());
         if(param.getPhone()!=null && !"".equals(param.getPhone())){
             param.setPhone(PhoneUtil.encryptPhone(param.getPhone()));
         }

fs-doctor-app/src/main/java/com/fs/app/controller/DoctorArticleController.java

@@ -32,10 +32,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.text.ParseException;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 
 
@@ -88,6 +85,10 @@ public class DoctorArticleController extends  AppBaseController {
         param.setDoctorId(Long.parseLong(getDoctorId()));
         param.setViews(0l);
         if(doctorArticleService.insertFsDoctorArticle(param)>0){
+            Collection<String> keys = redisCache.keys("getDoctorArticleList*");
+            for (String key : keys) {
+                redisCache.deleteObject(key);
+            }
             return R.ok();
         }
         else
@@ -101,6 +102,10 @@ public class DoctorArticleController extends  AppBaseController {
     public R editDoctorArticle(@Validated @RequestBody FsDoctorArticle param, HttpServletRequest request) throws ParseException {
 
         if(doctorArticleService.updateFsDoctorArticle(param)>0){
+            Collection<String> keys = redisCache.keys("getDoctorArticleList*");
+            for (String key : keys) {
+                redisCache.deleteObject(key);
+            }
             return R.ok();
         }
         else
@@ -115,6 +120,10 @@ public class DoctorArticleController extends  AppBaseController {
     public R delStoreNotice(  @RequestBody FsDoctorArticle param, HttpServletRequest request) throws ParseException {
 
         if(doctorArticleService.deleteFsDoctorArticleByArticleId(param.getArticleId())>0){
+            Collection<String> keys = redisCache.keys("getDoctorArticleList*");
+            for (String key : keys) {
+                redisCache.deleteObject(key);
+            }
             return R.ok();
         }
         else

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/company/service/impl/CompanyServiceImpl.java

@@ -45,6 +45,8 @@ import org.springframework.stereotype.Service;
 import com.fs.company.service.ICompanyService;
 import org.springframework.transaction.annotation.Transactional;
 
+import static com.fs.company.service.impl.CompanyMiniappServiceImpl.GET_MINI_APP_STR;
+
 /**
  * 企业Service业务层处理
  *
@@ -105,9 +107,12 @@ public class CompanyServiceImpl implements ICompanyService
      * @return 企业
      */
     @Override
-    public Company selectCompanyById(Long companyId)
-    {
-        return companyMapper.selectCompanyById(companyId);
+    public Company selectCompanyById(Long companyId){
+        Company company = companyMapper.selectCompanyById(companyId);
+        List<CompanyMiniapp> miniApp = companyMiniappService.getMiniAppListByCompanyList(Collections.singletonList(company.getCompanyId()));
+        company.setMiniAppMaster(GET_MINI_APP_STR.apply(0, miniApp));
+        company.setMiniAppServer(GET_MINI_APP_STR.apply(1, miniApp));
+        return company;
     }
 
     /**

fs-service/src/main/java/com/fs/company/service/impl/CompanyUserServiceImpl.java

@@ -246,12 +246,13 @@ public class CompanyUserServiceImpl implements ICompanyUserService
     @Transactional
     public int insertUser(CompanyUser user)
     {
+        logger.info("打印邀请用户信息------------------------------》：{}",user);
         // 新增用户信息
         int rows = companyUserMapper.insertCompanyUser(user);
-        // 新增用户岗位关联
-        insertUserPost(user);
-        // 新增用户与角色管理
-        insertUserRole(user);
+//        // 新增用户岗位关联
+//        insertUserPost(user);
+//        // 新增用户与角色管理
+//        insertUserRole(user);
         //新增用户需要修改密码
         redisCache.setCacheObject("newCompanyUser:" + user.getCompanyId() + ":" +user.getUserName(),user.getUserId());
         return rows;

fs-service/src/main/java/com/fs/course/param/BatchVideoSvae.java

@@ -11,4 +11,6 @@ public class BatchVideoSvae {
 
     // 项目ID
     private Long projectId;
+
+    private Long userId;
 }

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

@@ -22,4 +22,6 @@ public class FsUserCourseVideoFinishUParam implements Serializable {
     private Integer linkType;
     private Integer isRoom;//是否群聊
     private Integer isOpen;//是否公开课
+    private Long periodId;
+    private Integer projectId;
 }

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

@@ -1905,6 +1905,7 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
 
         List<FsUserCourseVideo> collect = videoResourceList.stream().map(e -> {
             FsUserCourseVideo entity = new FsUserCourseVideo();
+            entity.setUserId(vo.getUserId());
             entity.setTitle(e.getResourceName());
             entity.setVideoUrl(e.getVideoUrl());
             entity.setThumbnail(e.getThumbnail());

fs-service/src/main/java/com/fs/his/mapper/FsCouponMapper.java

@@ -96,6 +96,6 @@ public interface FsCouponMapper
             " order by c.coupon_id desc "+
             "</script>"})
     List<FsCouponListUVO> selectFsCouponListUVO(@Param("maps")FsCouponListUParam param);
-    @Update("update fs_coupon set remain_number=(select ifnull(count(1),0) from fs_user_coupon uc where uc.coupon_id=#{couponId}) where coupon_id=#{couponId}")
+    @Update("update fs_coupon set remain_number=number-(select ifnull(count(1),0) from fs_user_coupon uc where uc.coupon_id=#{couponId}) where coupon_id=#{couponId}")
     int updateRemainCount(Long couponId);
 }

fs-service/src/main/resources/mapper/course/FsUserCourseVideoMapper.xml

@@ -163,6 +163,7 @@
         file_size,
         file_key,
         is_transcode,
+        user_id,
         project_id
         )
         values
@@ -184,6 +185,7 @@
             #{item.fileSize},
             #{item.fileKey},
             #{item.isTranscode},
+            #{item.userId},
             #{item.projectId}
             )
         </foreach>
@@ -363,7 +365,7 @@
         select *  from fs_user_course_video
         where video_id=#{videoId} and is_del = 0
         <if test="userId != null">
-            user_id = #{userId}
+           and user_id = #{userId}
         </if>
     </select>