gnitif преди 2 години
родител
ревизия
58aa379836

+ 45 - 9
app/Http/Controllers/QuickApp/Book/ChapterController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\QuickApp\Book;
 
+use App\Modules\SendOrder\Models\SendOrder;
 use App\Modules\SendOrder\Services\SendOrderService;
 use App\Modules\Statistic\Services\WapVisitStatService;
 use App\Modules\User\Services\UserBookCombinationConfigService;
@@ -78,6 +79,7 @@ class ChapterController extends BaseController
             $change_chapter_name = 1;
         }
         $account = $this->getAccount();
+        $work_wechat_info = $this->getWorkWechatInfo($bid);
         switch ($book_info->charge_type) {
             case 'BOOK':
                 $price = $this->getPriceNew($book_info, 0, $account);
@@ -87,6 +89,13 @@ class ChapterController extends BaseController
                     $v->next_price = 0;
                     $v->is_need_charge = $v->is_vip ? $is_need_charge : false;
                     $v->price = $price;
+                    if ($work_wechat_info['force_add_work_wechat_type'] >  0 &&  $v->sequence >= $work_wechat_info['force_add_work_wechat_seq']){
+                        $v->force_add_work_wechat_type = $work_wechat_info['force_add_work_wechat_type'];
+                        $v->force_add_work_wechat_url = $work_wechat_info['force_add_work_wechat_url'];
+                    }else{
+                        $v->force_add_work_wechat_type = 0;
+                        $v->force_add_work_wechat_url = "";
+                    }
 
                     // 限免判断
                     if ($isFree) {
@@ -121,7 +130,13 @@ class ChapterController extends BaseController
                             $v->is_vip = 0;
                         }
                     }
-
+                    if ($work_wechat_info['force_add_work_wechat_type'] >  0 &&  $v->sequence >= $work_wechat_info['force_add_work_wechat_seq']){
+                        $v->force_add_work_wechat_type = $work_wechat_info['force_add_work_wechat_type'];
+                        $v->force_add_work_wechat_url = $work_wechat_info['force_add_work_wechat_url'];
+                    }else{
+                        $v->force_add_work_wechat_type = 0;
+                        $v->force_add_work_wechat_url = "";
+                    }
                     // 限免判断
                     if ($isFree) {
                         $v->is_need_charge = false;
@@ -643,13 +658,13 @@ class ChapterController extends BaseController
         Redis::hset($key, $field, $old + 1);
         [$force_add_desk_type,$is_need_query_send_order] = $this->addDesktopType($bid, $chapter->sequence);
         $chapter->force_add_desk_type = $force_add_desk_type;
-        $force_add_work_wecaht_type = 0;
-        $force_add_work_wecaht_url = "";
+        $force_add_work_wechat_type = 0;
+        $force_add_work_wechat_url = "";
         if($is_need_query_send_order){
-            [$force_add_work_wecaht_type, $force_add_work_wecaht_url] = $this->addWorkWechatType($chapter->sequence);
+            [$force_add_work_wechat_type, $force_add_work_wechat_url] = $this->addWorkWechatType($chapter->sequence);
         }
-        $chapter->force_add_work_wecaht_type = $force_add_work_wecaht_type;
-        $chapter->force_add_work_wecaht_url = $force_add_work_wecaht_url;
+        $chapter->force_add_work_wechat_type = $force_add_work_wechat_type;
+        $chapter->force_add_work_wechat_url = $force_add_work_wechat_url;
         //统计
         $this->stats();
         $next_chapter_order_status = $this->nextChapterOrderStatus($bid, $chapter->next_cid);
@@ -1029,9 +1044,9 @@ class ChapterController extends BaseController
         if ($send_order_id) {
             $send_order_info = QappSendOrder::getSendOrderById($send_order_id);
             if (!$send_order_info) return [$deault_force_add_desk_type, $work_wechat_url];
-            if($send_order_info['force_add_work_wecaht_status'] == 1 && $send_order_info['force_add_work_wecaht_seq'] <= ($sequence+1)){
-                $deault_force_add_desk_type =$send_order_info['force_add_work_wecaht_type'];
-                $work_wechat_url =$send_order_info['force_add_work_wecaht_url'];
+            if($send_order_info['force_add_work_wechat_status'] == 1 && $send_order_info['force_add_work_wechat_seq'] <= ($sequence+1)){
+                $deault_force_add_desk_type =$send_order_info['force_add_work_wechat_type'];
+                $work_wechat_url =$send_order_info['force_add_work_wechat_url'];
             }
         }
         return [$deault_force_add_desk_type, $work_wechat_url];
@@ -1142,4 +1157,25 @@ class ChapterController extends BaseController
             return 1;
         }
     }
+
+    private function getWorkWechatInfo($bid)
+    {
+       $info = ['force_add_work_wechat_type' => 0,'force_add_work_wechat_url' =>  "",'force_add_work_wechat_seq' => 0];
+        $send_order_id = $this->GetBindSendOrderId($this->uid);
+        $send_order_id = 3792206;
+        if ($send_order_id) {
+            $send_order_info = QappSendOrder::getSendOrderById($send_order_id);
+            if (!$send_order_info) return $info;
+            $send_order_bid = SendOrder::where(['id' => $send_order_id])->value('book_id');
+            if($send_order_info['force_add_work_wechat_status'] == 1 &&  $send_order_bid == $bid){
+                $info['force_add_work_wechat_type'] = $send_order_info['force_add_work_wechat_type'];
+                $info['force_add_work_wechat_url'] = $send_order_info['force_add_work_wechat_url'];
+                $info['force_add_work_wechat_seq'] = $send_order_info['force_add_work_wechat_seq'];
+            }else{
+                return  $info;
+            }
+
+        }
+        return $info;
+    }
 }

+ 2 - 0
app/Http/Controllers/QuickApp/Book/Transformers/ChapterListTransformer.php

@@ -22,6 +22,8 @@ class ChapterListTransformer
             'recent_update_at' => $chapter->recent_update_at,
             'is_need_charge'   => $chapter->is_need_charge ? 1 : 0,
             'next_chapter_status'   => $chapter->next_chapter_status,
+            "force_add_work_wechat_type" => $chapter->force_add_work_wechat_type,
+            "force_add_work_wechat_url" => $chapter->force_add_work_wechat_url,
             'next_price'   => $chapter->next_price,
         ];
     }

+ 2 - 2
app/Http/Controllers/QuickApp/Book/Transformers/ChapterTransformer.php

@@ -22,8 +22,8 @@ class ChapterTransformer
             'next_chapter_status'   =>  $chapter->next_chapter_status,
             'next_price'   =>  $chapter->next_price,
             'charge_type'   =>  $chapter->charge_type,
-            "force_add_work_wecaht_type" =>  $chapter->force_add_work_wecaht_type,
-            "force_add_work_wecaht_url" =>   $chapter->force_add_work_wecaht_url,
+            "force_add_work_wechat_type" =>  $chapter->force_add_work_wechat_type,
+            "force_add_work_wechat_url" =>   $chapter->force_add_work_wechat_url,
         ];
     }
 }