'123'

@@ -93,6 +93,17 @@ class Business extends Api
                 'createtime'=>$time,
             ];
             $cancel=Db::name('verification_cancel')->insertGetId($canceldata);
+            //查询本订单是否所有卡卷都已核销
+            $receivewhere['verification_order_id']=['=',$receive['verification_order_id']];
+            $receivewhere['type']=['=',0];
+            $isuser=Db::name('verification_receive')->where(['verification_order_id','=',$receive['verification_order_id']])->count();
+            if($isuser==0){
+                $isorderuser['id']=['=',$receive['verification_order_id']];
+                $isuserdata=[
+                    'status'=>1
+                ];
+                $isorder=Db::name('order')->where($isorderuser)->update($isuserdata);
+            }
             Db::commit();
         }catch (Exception $e){
             Db::rollback();
@@ -168,7 +179,7 @@ class Business extends Api
             $where['a.phone'] =['like', '%' . $keyfield . '%'];
             $where['a.order_no'] = ['like', '%' . $keyfield . '%'];
         }
-        $field = "a.id,a.order_no,a.name,a.phone,a.type,b.title";
+        $field = "a.id,a.order_no,a.name,a.phone,a.type,b.title,DATE_FORMAT(FROM_UNIXTIME(a.paytime), '%Y-%m-%d %H:%i:%S') AS paytime,a.type";
         $order=Db::name('verification_order')
             ->alias('a')
             ->join('verification_activity b','a.verification_activity_id=b.id')
@@ -188,9 +199,10 @@ class Business extends Api
         $field = "a.id,a.order_no,a.name,a.phone,a.type,b.title";
         $order=Db::name('verification_order')
             ->alias('a')
-            ->join('verification_activity b','a.verification_activity_id=b.id')
             ->where($where)
-            ->field($field)
+            ->join('verification_store b','a.verification_store_id=b.id')
+            ->join('verification_activity c','a.verification_activity_id=c.id')
+            ->field('a.id,a.name,a.phone,a.type,a.status,c.image,a.order_no,c.title,b.address,b.lng,b.lat,a.price,a.payMode,DATE_FORMAT(FROM_UNIXTIME(a.paytime), "%Y-%m-%d %H:%i:%S") AS paytime')
             ->find();
         //查询具体卡卷
         $receivewhere['verification_order_id']=['=',$order['id']];

@@ -166,13 +166,13 @@ class Client extends Base
      */
     public function orderinfo(){
         $order_id=$this->postParam['id'];
-        $where['id']=$order_id;
-        $where['user_id']=$this->auth->id;
+        $where['a.id']=$order_id;
+        $where['a.user_id']=$this->auth->id;
         $verification_store_id=$this->store_id;
         $where['a.verification_store_id']=$verification_store_id;
-
         $order=Db::name('verification_order')
             ->alias('a')
+            ->where($where)
             ->join('verification_store b','a.verification_store_id=b.id')
             ->join('verification_activity c','a.verification_activity_id=c.id')
             ->field('a.id,a.type,a.status,c.image,a.order_no,c.title,b.address,b.lng,b.lat,a.price,a.payMode,DATE_FORMAT(FROM_UNIXTIME(a.paytime), "%Y-%m-%d %H:%i:%S") AS paytime')