update

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

@@ -61,16 +61,16 @@ class OrderController extends AuthController
         $payment_amount = $req['total_amount'] - $discount_amount;
         $payment_amount = $payment_amount < 0 ? 0 : $payment_amount;
 
+        if ($req['payment_type'] == 2 && $payment_amount > 0 && empty($req['pay_password'])) {
+            return out(null, 10011, '请输入支付密码');
+        }
+
         if ($req['payment_type'] == 2) {
             if ($user['balance'] < $payment_amount) {
                 return out(null, 601, '余额不足');
             }
         }
 
-        if ($req['payment_type'] == 2 && $payment_amount > 0 && empty($req['pay_password'])) {
-            return out(null, 10011, '请输入支付密码');
-        }
-
         $order_status = $payment_status = 1;
         $payment_time = 0;
         if ($payment_amount == 0 || $req['payment_type'] == 2) {
@@ -177,7 +177,7 @@ class OrderController extends AuthController
             'docter_id' => 'required_if:product_type,3|integer',
             'vaccine_id' => 'required_if:product_type,4|integer',
             'nurse_ids' => 'required_if:product_type,5|json',
-            'pay_password|支付密码' => 'required_if:payment_type,2|integer',
+            'pay_password|支付密码' => 'integer',
         ]);
         $user = $this->user;
 
@@ -209,6 +209,10 @@ class OrderController extends AuthController
         $payment_amount = $req['total_amount'] - $discount_amount;
         $payment_amount = $payment_amount < 0 ? 0 : $payment_amount;
 
+        if ($req['payment_type'] == 2 && $payment_amount > 0 && empty($req['pay_password'])) {
+            return out(null, 10011, '请输入支付密码');
+        }
+
         if ($req['payment_type'] == 2) {
             if ($user['balance'] < $payment_amount) {
                 return out(null, 601, '余额不足');
@@ -334,7 +338,7 @@ class OrderController extends AuthController
             'is_security' => 'required|in:0,1',
             'guardian_name' => 'required|max:50',
             'relationship_type' => 'required|integer',
-            'pay_password|支付密码' => 'required_if:payment_type,2|integer',
+            'pay_password|支付密码' => 'integer',
         ]);
         $user = $this->user;
 
@@ -361,6 +365,10 @@ class OrderController extends AuthController
         $payment_amount = $req['total_amount'] - $discount_amount;
         $payment_amount = $payment_amount < 0 ? 0 : $payment_amount;
 
+        if ($req['payment_type'] == 2 && $payment_amount > 0 && empty($req['pay_password'])) {
+            return out(null, 10011, '请输入支付密码');
+        }
+
         if ($req['payment_type'] == 2) {
             if ($user['balance'] < $payment_amount) {
                 return out(null, 601, '余额不足');