commit

app/admin/model/diagnosis/DiagnosisOrder.php

@@ -51,30 +51,30 @@ class DiagnosisOrder extends BaseModel
         if ($where['pay_type']) $model->where('a.pay_type', $where['pay_type']);
         if ($where['status'] == 0 && $where['status'] != ''){
 
-            $model->where('a.status', 0);
+            $model->where('a.status', 0)->where('paid', 1);
 
         }elseif ($where['status'] == 1){
 
-            $model->where('a.status', 1);
+            $model->where('a.status', 1)->where('paid', 1);
 
         }elseif ($where['status'] == 2){
 
-            $model->where('a.status', 2);
+            $model->where('a.status', 2)->where('paid', 1);
 
         }elseif ($where['status'] == 3){
 
-            $model->where('a.status', 3);
+            $model->where('a.status', 3)->where('paid', 1);
 
         }elseif ($where['status'] == 4){
 
-            $model->where('a.after_sales', 1);
+            $model->where('a.after_sales', 1)->where('paid', 1);
 
         }elseif ($where['status'] == 5){
 
-            $model->where('a.status', -1);
+            $model->where('a.status', -1)->where('paid', 1);
         }elseif ($where['status'] == 6){
 
-            $model->where('a.status', -2);
+            $model->where('a.status', -2)->where('paid', 1);
         }
         if (isset($where['data']) && $where['data'] !== '') {
             $model = self::getModelTime($where, $model,   'create_time');
@@ -236,7 +236,7 @@ class DiagnosisOrder extends BaseModel
 
         self::where('order_id', $orderId)->update(['paid' => 1, 'pay_time' => time()]);
         $now_money = User::where('uid', $order['uid'])->value('now_money');
-        UserBill::expend('创建订单', $order['uid'], 'now_money', 'pay_money', $order['pay_price'], $order['id'], $now_money, '支付' . floatval($order['pay_price']) . '元创建订单');
+        UserBill::expend('支付订单', $order['uid'], 'now_money', 'pay_money', $order['pay_price'], $order['id'], $now_money, '支付' . floatval($order['pay_price']) . '元创建订单');
         return true;
     }
 

app/api/controller/diagnosis/DiagnosisOrderController.php

@@ -78,7 +78,9 @@ class DiagnosisOrderController
             $ot_price += $cate['price'];
             $commission += $cate['reward'];
         }
-        $card_id = implode(',', $card_id);
+        if ($card_id){
+            $card_id = implode(',', $card_id);
+        }
         if ($data['service_id']){
             $data['service_id'] = explode(',', $data['service_id']);
             foreach ($data['service_id'] as $item){
@@ -100,7 +102,7 @@ class DiagnosisOrderController
         $order['attr'] = [
             'uid' => $request->uid(),
             'time' => strtotime($data['time']),
-            'service_id' => implode(',', $data['service_id']),
+            'service_id' => $data['service_id'] ? implode(',', $data['service_id']) : [],
             'name' => $data['name'],
             'sex' => $data['sex'],
             'age' => $data['age'],