Merge remote-tracking branch 'origin/ScrmStores' into ScrmStores

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

@@ -1738,7 +1738,7 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
             return ResponseResult.fail(504, "请观看最新的课程项目");
         }
         // 项目看课数限制
-        if(!"福本源".equals(signProjectName) && !"宽益堂".equals(signProjectName) && !CloudHostUtils.hasCloudHostName("弘德堂")) {
+        if(!"福本源".equals(signProjectName) && !"医健宝".equals(signProjectName) && !"宽益堂".equals(signProjectName) && !CloudHostUtils.hasCloudHostName("弘德堂")) {
             Integer logCount = fsUserCourseMapper.selectTodayCourseWatchLogCountByUserIdAndProjectId(param.getUserId(), courseProject);
             if (Objects.isNull(watchCourseVideo) && logCount > 0) {
                 return ResponseResult.fail(504, "超过项目看课数量限制");

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

@@ -398,17 +398,17 @@ public class FsStoreProductScrmServiceImpl implements IFsStoreProductScrmService
                 case 1://非处方
                     break;
                 case 2://处方
-                    if("".equals(store.getDrugLicense()) ||  LocalDate.now().isBefore(store.getDrugLicenseExpiryEnd())){
+                    if(StringUtils.isEmpty(store.getDrugLicense()) || "".equals(store.getDrugLicense()) ||  LocalDate.now().isAfter(store.getDrugLicenseExpiryEnd())){
                         return R.error("店铺药品资质为空或已过期，请完善后再添加");
                     }
                     break;
                 case 3://食品
-                    if("".equals(store.getFoodLicense()) ||  LocalDate.now().isBefore(store.getFoodLicenseExpiryEnd())){
+                    if(StringUtils.isEmpty(store.getFoodLicense()) || "".equals(store.getFoodLicense()) ||  LocalDate.now().isAfter(store.getFoodLicenseExpiryEnd())){
                         return R.error("店铺食品资质为空或已过期，请完善后再添加");
                     }
                     break;
                 case 4://器械
-                    if("".equals(store.getMedicalDevice3()) ||  LocalDate.now().isBefore(store.getMedicalDevice3ExpiryEnd())){
+                    if(StringUtils.isEmpty(store.getMedicalDevice3()) || "".equals(store.getMedicalDevice3()) ||  LocalDate.now().isAfter(store.getMedicalDevice3ExpiryEnd())){
                         return R.error("店铺器械资质为空或已过期，请完善后再添加");
                     }
                     break;

fs-store/src/main/java/com/fs/hisStore/controller/store/FsStoreProductCategoryScrmController.java

@@ -127,9 +127,9 @@ public class FsStoreProductCategoryScrmController extends BaseController
     @GetMapping("/getAllList")
     public R getAllList(FsStoreProductCategoryScrm fsStoreProductCategory)
     {
-        StoreLoginUserScrm loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        Long storeId = loginUser.getFsStore().getStoreId();
-        List<FsStoreProductCategorysVO> list = fsStoreProductCategoryService.selectFsStoreProductCategorysVOList(storeId);
+        fsStoreProductCategory.setIsShow(1);
+        fsStoreProductCategory.setIsDel(0);
+        List<FsStoreProductCategoryScrm> list = fsStoreProductCategoryService.selectFsStoreProductCategoryList(fsStoreProductCategory);
         return R.ok().put("data", list);
     }