Browse Source

公共报名写死的地方改为配置

wangzq 2 years ago
parent
commit
7a8ac37d0b
2 changed files with 32 additions and 3 deletions
  1. 30 1
      app/Libs/Helpers.php
  2. 2 2
      app/Modules/Book/Services/BookAuditService.php

+ 30 - 1
app/Libs/Helpers.php

@@ -934,4 +934,33 @@ if(!function_exists('get_public_package_channel_ids')){
     function  get_public_package_channel_ids(){
         return config("package.channel_id");
     }
-}
+}
+
+/***
+ *  获取默认公共包站点id
+ * name: get_default_public_channel_id
+ * @return int|mixed
+ * date 2022/09/23 14:51
+ */
+if (!function_exists("get_default_public_channel_id")){
+
+    function get_default_public_channel_id()
+    {
+       $package = get_default_public_package_info();
+       return $package['channel_id'] ?? 0;
+    }
+}
+
+/***
+ * 获取默认公共包站点id和包名
+ * name: get_default_public_package_info
+ * @return \Illuminate\Config\Repository|\Illuminate\Foundation\Application|mixed
+ * date 2022/09/23 14:51
+ */
+if (!function_exists("get_default_public_channel_id")){
+    function get_default_public_package_info()
+    {
+        return config("package.default");
+    }
+}
+

+ 2 - 2
app/Modules/Book/Services/BookAuditService.php

@@ -37,7 +37,7 @@ class BookAuditService
 
         // 一次性获取书籍列表
         $bids  = array_merge($hotBids, $liveBids, $recomBids, $newBids);
-        $channel_id = ($package === 'com.beidao.kuaiying.zsy') ? 7477 : 0;
+        $channel_id = is_public_package($package) ? get_default_public_channel_id() : 0;
         $books = BookConfigService::getBookLists(compact('bids','channel_id'));
 
         return [
@@ -117,7 +117,7 @@ class BookAuditService
     private static function getCheckBooks($bid_list,$channel,$package,$is_author)
     {
         $hidden_cp = getHiddenCp();
-        if($package !== 'com.beidao.kuaiying.zsy'){
+        if(!is_public_package($package)){
             $hidden_cp = array_merge($hidden_cp,['lianshang']);
         }
         //获取书本数量