Merge branch 'develop' of http://git.9026.com/swdz-WangHaijun/BaoMa into develop

app/Http/Controllers/Api/V1/DocterController.php

@@ -204,7 +204,7 @@ class DocterController extends AuthController
         $user = $this->user;
 
         $show_days = DocterSetting::where('docter_id', $req['docter_id'])->where('type', 1)->value('show_days');
-        $per_page = !empty($show_days) ? $show_days : 15;
+        $per_page = !empty($show_days) ? $show_days : 0;
         $data = Schedule::with(['schedulePeriod.timePeriod', 'schedulePeriod.organization'])->where('docter_id', $req['docter_id'])->where('schedule_type', 1)->where('schedule_day', '>=', date('Ymd'))->orderBy('schedule_day', 'asc')->paginate($per_page)->toArray();
         if (!empty($data)) {
             foreach ($data['data'] as $k => &$v) {
@@ -245,7 +245,7 @@ class DocterController extends AuthController
         ]);
 
         $docterSettings = DocterSetting::select(['service_num', 'show_days'])->where('org_id', $req['organization_id'])->where('type', $req['schedule_type'])->first();
-        $per_page = !empty($docterSettings['show_days']) ? $docterSettings['show_days'] : 15;
+        $per_page = !empty($docterSettings['show_days']) ? $docterSettings['show_days'] : 0;
         $data = Schedule::with(['schedulePeriod.timePeriod', 'schedulePeriod.organization'])->where('schedule_day', '>=', date('Ymd'))->where('organization_id', $req['organization_id'])->where('schedule_type', $req['schedule_type'])->orderBy('schedule_day', 'asc')->paginate($per_page)->toArray();
 
         if (!empty($data)) {

app/Http/Controllers/Api/V1/OrderController.php

@@ -557,6 +557,10 @@ class OrderController extends AuthController
         $orderPacks = OrderPack::where('user_id', $user['id'])->where('end_time', '>', time())->get()->toArray();
         if (!empty($orderPacks)) {
             foreach ($orderPacks as $k => $v) {
+                $order_status = Order::where('id', $v['order_id'])->value('order_status');
+                if (!in_array($order_status, [3,4])) {
+                    unset($orderPacks[$k]);
+                }
                 if ($v['usable_status'] == 0) {
                     unset($orderPacks[$k]);
                 }