Merge branch 'master' into develop

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

@@ -156,7 +156,7 @@ class OrderController extends AuthController
         $payment_amount = $payment_amount < 0 ? 0 : $payment_amount;
 
         //疫苗和儿保订单未结束时不能再次下单
-        if (in_array($req['product_type'], [4,5]) && Order::whereIn('product_type', [4,5])->where('user_id', $user['id'])->whereIn('order_status', [2,3])->exists()) {
+        if (in_array($req['product_type'], [4,5]) && Order::whereIn('product_type', [4,5])->where('user_id', $user['id'])->whereIn('order_status', [2,3,7])->exists()) {
             return out(null, 10012, '您已经下过'.config('config.product_type_map')[$req['product_type']].'订单，并且订单还未完成');
         }