调整看课记录多条校验，迁移运费模块，快递公司

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

@@ -129,4 +129,10 @@ public class FsCityController extends BaseController
         return R.ok().put("data",fsCityService.getCitysArea());
     }
 
+    @GetMapping("/getAllList")
+    public R getAllList(FsCity fsCity)
+    {
+        List<FsCity> list = fsCityService.selectFsCityList(fsCity);
+        return R.ok().put("data",list);
+    }
 }

fs-common/src/main/java/com/fs/common/core/redis/RedisCache.java

@@ -233,4 +233,7 @@ public class RedisCache
     }
 
 
+    public Boolean setIfAbsent(String key, String value, long timeout, TimeUnit unit) {
+        return redisTemplate.opsForValue().setIfAbsent(key, value, timeout, unit);
+    }
 }

fs-company/src/main/java/com/fs/hisStore/controller/FsCityScrmController.java

@@ -1,59 +0,0 @@
-package com.fs.hisStore.controller;
-
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.R;
-import com.fs.hisStore.domain.FsCityScrm;
-import com.fs.hisStore.service.IFsCityScrmService;
-import com.fs.store.utils.CityTreeUtil;
-import com.fs.store.vo.CityVO;
-import com.google.common.collect.Lists;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import springfox.documentation.annotations.Cacheable;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-
-/**
- * 城市Controller
- *
- * @author fs
- * @date 2022-03-15
- */
-@RestController
-@RequestMapping("/store/store/city")
-public class FsCityScrmController extends BaseController
-{
-    @Autowired
-    private IFsCityScrmService fsCityService;
-
-//
-//    @GetMapping("/getAllList")
-//    @Cacheable("citys")
-//    public R getAllList(FsCityScrm fsCity)
-//    {
-//        List<FsCityScrm> list = fsCityService.selectFsCityList(fsCity);
-//        return R.ok().put("data",list);
-//    }
-
-
-    @ApiOperation("获取城市数据")
-    @GetMapping("/getCitys")
-    @Cacheable("citys")
-    public R getCitys(HttpServletRequest request){
-        List<FsCityScrm> list=fsCityService.selectFsCitys();
-        List<CityVO> cityVOS = Lists.newArrayList();
-        for (FsCityScrm city : list){
-            CityVO cityVO = new CityVO();
-            cityVO.setValue(Long.parseLong(city.getCityId()));
-            cityVO.setLabel(city.getCityName());
-            cityVO.setPid(Long.parseLong(city.getParentId()));
-            cityVOS.add(cityVO);
-        }
-        return R.ok().put("data", CityTreeUtil.list2TreeConverter(cityVOS, 0));
-
-    }
-}

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

@@ -1515,9 +1515,18 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
     @Transactional
     public ResponseResult<FsUser> isAddCompanyUser(FsUserCourseAddCompanyUserParam param) {
         logger.info("\n 【进入个微-判断是否添加客服】，入参：{}",param);
+
+        // 生成锁的key，使用用户ID和视频ID组合
+        String lockKey = "submit:lock:" + param.getUserId() + ":" + param.getVideoId();
+        // 尝试获取锁，3秒过期
+        boolean locked = redisCache.setIfAbsent(lockKey, "1", 1, TimeUnit.SECONDS);
+
+        if (!locked) {
+            return ResponseResult.fail(504, "请勿重复提交，请等待3秒后重试");
+        }
         //查询用户
-        FsUser fsUser = fsUserMapper.selectFsUserById(param.getUserId());
-        if (fsUser == null){
+       FsUser fsUser = fsUserMapper.selectFsUserById(param.getUserId());
+         if (fsUser == null){
             return ResponseResult.fail(404,"当前用户信息不存在");
         }
         //公开课

fs-service/src/main/java/com/fs/hisStore/service/impl/FsShippingTemplatesScrmServiceImpl.java

@@ -25,7 +25,7 @@ import com.fs.hisStore.service.IFsShippingTemplatesScrmService;
 
 /**
  * 运费模板Service业务层处理
- * 
+ *
  * @author fs
  * @date 2022-03-15
  */
@@ -45,7 +45,7 @@ public class FsShippingTemplatesScrmServiceImpl implements IFsShippingTemplatesS
 
     /**
      * 查询运费模板
-     * 
+     *
      * @param shippingId 运费模板ID
      * @return 运费模板
      */
@@ -57,7 +57,7 @@ public class FsShippingTemplatesScrmServiceImpl implements IFsShippingTemplatesS
 
     /**
      * 查询运费模板列表
-     * 
+     *
      * @param fsShippingTemplates 运费模板
      * @return 运费模板
      */
@@ -69,7 +69,7 @@ public class FsShippingTemplatesScrmServiceImpl implements IFsShippingTemplatesS
 
     /**
      * 新增运费模板
-     * 
+     *
      * @param fsShippingTemplates 运费模板
      * @return 结果
      */
@@ -82,7 +82,7 @@ public class FsShippingTemplatesScrmServiceImpl implements IFsShippingTemplatesS
 
     /**
      * 修改运费模板
-     * 
+     *
      * @param fsShippingTemplates 运费模板
      * @return 结果
      */
@@ -95,7 +95,7 @@ public class FsShippingTemplatesScrmServiceImpl implements IFsShippingTemplatesS
 
     /**
      * 批量删除运费模板
-     * 
+     *
      * @param shippingIds 需要删除的运费模板ID
      * @return 结果
      */
@@ -107,7 +107,7 @@ public class FsShippingTemplatesScrmServiceImpl implements IFsShippingTemplatesS
 
     /**
      * 删除运费模板信息
-     * 
+     *
      * @param shippingId 运费模板ID
      * @return 结果
      */
@@ -123,7 +123,11 @@ public class FsShippingTemplatesScrmServiceImpl implements IFsShippingTemplatesS
             throw new CustomException("请指定包邮地区");
         }
         FsShippingTemplatesScrm shippingTemplates = new FsShippingTemplatesScrm();
-        BeanUtil.copyProperties(fsShippingTemplates,shippingTemplates);
+        shippingTemplates.setId(fsShippingTemplates.getId());
+        shippingTemplates.setName(fsShippingTemplates.getName());
+        shippingTemplates.setType(fsShippingTemplates.getType());
+        shippingTemplates.setSort(fsShippingTemplates.getSort());
+        shippingTemplates.setAppoint(fsShippingTemplates.getAppoint());
         shippingTemplates.setRegionInfo(JSON.toJSONString(fsShippingTemplates.getRegionInfo()));
         shippingTemplates.setAppointInfo(JSON.toJSONString(fsShippingTemplates.getAppointInfo()));
         if(fsShippingTemplates.getId() != null && fsShippingTemplates.getId()  > 0){