fly 5 anos atrás
pai
commit
06b01a0a96

+ 2 - 2
app/Http/Controllers/QuickApp/Book/ChapterController.php

@@ -200,8 +200,8 @@ class ChapterController extends BaseController
                 break;
             default:
                 foreach ($chapters as $v) {
-                    $v->is_need_charge = $this->isChapterNeedCharge($bid, $v->id, $price);
                     $v->price = $this->getPrice($book_info, $v->size);
+                    $v->is_need_charge = $this->isChapterNeedCharge($bid, $v->id, $v->price);
                 }
                 break;
         }
@@ -638,7 +638,7 @@ class ChapterController extends BaseController
      */
     private function isChapterNeedCharge(int $bid, int $cid, float $price)
     {
-        $chapter_order = ChapterOrderService::checkIsOrdered($this->uid, $bid, $cid);
+        $chapter_order = ChapterOrderService::checkIsOrderedStatic($this->uid, $bid, $cid);
         if ($chapter_order) {
             return false;
         } else {

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

@@ -19,7 +19,7 @@ class ChapterListTransformer
             'prev_cid'   =>  $chapter->prev_cid,
             'next_cid'   =>  $chapter->next_cid,
             'recent_update_at'   =>  $chapter->recent_update_at,
-            'is_need_subscirbe' => isset($chapter->is_need_subscirb) ? $chapter->is_need_subscirb : '',
+            'is_need_charge' => $chapter->is_need_charge,
         ];
     }
 }

+ 6 - 1
app/Modules/Subscribe/Services/ChapterOrderService.php

@@ -2,13 +2,18 @@
 
 namespace App\Modules\Subscribe\Services;
 
+use App\Modules\BaseService;
 use DB;
 use App\Modules\User\Services\UserService;
 use App\Modules\Subscribe\Models\ChapterOrder;
 
+/**
+ * 
+ * @method static int checkIsOrderedStatic($uid, $bid, $cid)
+ */
 class ChapterOrderService
 {
-
+    use BaseService;
 
     //判断是否订购
     public function checkIsOrdered($uid, $bid, $cid)