Merge branch 'develop-new' of http://git.dayaedu.com/yonge/cooleshow into test

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/task/TaskController.java

@@ -75,6 +75,9 @@ public class TaskController extends BaseController {
     @Autowired
     private ImGroupService imGroupService;
 
+    @Autowired
+    private UserTenantAlbumRecordService userTenantAlbumRecordService;
+
     /***
      * 轮询用户订单
      * @author liweifan
@@ -231,4 +234,16 @@ public class TaskController extends BaseController {
     }
 
 
+    /**
+     * 机构学生训练教材过期
+     */
+    @GetMapping("/sendTenantAlbumMessage")
+    public HttpResponseResult<Object> sendTenantAlbumMessage() {
+
+        // 群发消息定时
+        userTenantAlbumRecordService.sendTenantAlbumMessage();
+
+        return HttpResponseResult.succeed();
+    }
+
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TenantAlbumCategoryServiceImpl.java

@@ -164,9 +164,9 @@ public class TenantAlbumCategoryServiceImpl extends ServiceImpl<TenantAlbumCateg
             QueryWrapper<TenantAlbum> queryWrapper = new QueryWrapper<>();
             queryWrapper.lambda()
                     .eq(ETenantAlbumCategoryType.CATEGORY_TYPE.equals(albumCategory.getCategoryType()),
-                            TenantAlbum::getCategoryLevelId, tenantAlbumCategory.getId())
+                            TenantAlbum::getCategoryTypeId, tenantAlbumCategory.getId())
                     .eq(ETenantAlbumCategoryType.CATEGORY_LEVEL.equals(albumCategory.getCategoryType()),
-                            TenantAlbum::getCategoryTypeId, tenantAlbumCategory.getId());
+                            TenantAlbum::getCategoryLevelId, tenantAlbumCategory.getId());
             Integer useCount = tenantAlbumMapper.selectCount(queryWrapper);
             if (useCount > 0) {
                 checkTenantAlbumCategoryDetailUsed(albumCategory.getCategoryType(), removeDetailIdList);