Merge branch 'kuaiyingyong' of iqiyoo:zhuishuyun_wap into kuaiyingyong

app/Http/Controllers/QuickApp/Book/ChapterController.php

@@ -309,7 +309,7 @@ class ChapterController extends BaseController
         ];
 
         if ($user_info['balance'] < $fee) {
-            //需要提箱
+            /*//需要提箱
             if ($this->isOrderRemind($bid)) {
 
                 if ($book_info->charge_type == 'BOOK') {
@@ -329,10 +329,17 @@ class ChapterController extends BaseController
                 } else {
                     return response()->error('QAPP_SYS_ERROR');
                 }
+            }*/
+            if ($book_info->charge_type == 'BOOK') {
+                return response()->error('QAPP_BOOK_INSUFFICIENT_BALANCE', $data);
+            } elseif ($book_info->charge_type == 'CHAPTER') {
+                return response()->error('QAPP_CHAPTER_INSUFFICIENT_BALANCE', $data);
+            } else {
+                return response()->error('QAPP_SYS_ERROR');
             }
         }
 
-        if ($this->isOrderRemind($bid)) {
+        /*if ($this->isOrderRemind($bid)) {
             if ($book_info->charge_type  == 'BOOK') {
                 return response()->error('QAPP_BOOK_BUY', $data);
             } else
@@ -341,7 +348,7 @@ class ChapterController extends BaseController
             } else {
                 return response()->error('QAPP_SYS_ERROR');
             }
-        }
+        }*/
         //付费 不提醒
         if ($this->balancePay($book_info, $cid, $chapter->size, $chapter->name, 0)) {
 
@@ -354,12 +361,19 @@ class ChapterController extends BaseController
         } else {
 
             //不需要提醒
-            if ($book_info->charge_type == 'BOOK') {
+            /*if ($book_info->charge_type == 'BOOK') {
                 return response()->error('QAPP_BOOK_SECOND_BALANCE_PAY', $data);
             } elseif ($book_info->charge_type == 'CHAPTER') {
                 return response()->error('QAPP_CHAPTER_SECOND_BALANCE_PAY', $data);
             } else {
                 return response()->error('QAPP_SYS_ERROR');
+            }*/
+            if ($book_info->charge_type == 'BOOK') {
+                return response()->error('QAPP_BOOK_INSUFFICIENT_BALANCE', $data);
+            } elseif ($book_info->charge_type == 'CHAPTER') {
+                return response()->error('QAPP_CHAPTER_INSUFFICIENT_BALANCE', $data);
+            } else {
+                return response()->error('QAPP_SYS_ERROR');
             }
         }
     }
@@ -452,12 +466,20 @@ class ChapterController extends BaseController
                 'discount' => ''
             ];
             //不需要提醒
-            if ($book_info->charge_type == 'BOOK') {
+            /*if ($book_info->charge_type == 'BOOK') {
                 return response()->error('QAPP_BOOK_SECOND_BALANCE_PAY', $data);
             } elseif ($book_info->charge_type == 'CHAPTER') {
                 return response()->error('QAPP_CHAPTER_SECOND_BALANCE_PAY', $data);
             } else {
                 return response()->error('QAPP_SYS_ERROR');
+            }*/
+
+            if ($book_info->charge_type == 'BOOK') {
+                return response()->error('QAPP_BOOK_INSUFFICIENT_BALANCE', $data);
+            } elseif ($book_info->charge_type == 'CHAPTER') {
+                return response()->error('QAPP_CHAPTER_INSUFFICIENT_BALANCE', $data);
+            } else {
+                return response()->error('QAPP_SYS_ERROR');
             }
         }
     }