Merge branch 'master' of http://47.108.67.251:8099/coupon.xp.yn.cn/coupon_backend

@@ -9,7 +9,7 @@ use think\Exception;
 /**
 /**
  * 商家端接口
  * 商家端接口
  */
  */
-class Business extends Api
+class Business extends Base
 {
 {
     protected $noNeedLogin = ['*'];
     protected $noNeedLogin = ['*'];
     protected $noNeedRight = ['*'];
     protected $noNeedRight = ['*'];
@@ -93,6 +93,17 @@ class Business extends Api
                 'createtime'=>$time,
                 'createtime'=>$time,
             ];
             ];
             $cancel=Db::name('verification_cancel')->insertGetId($canceldata);
             $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();
             Db::commit();
         }catch (Exception $e){
         }catch (Exception $e){
             Db::rollback();
             Db::rollback();
@@ -168,7 +179,7 @@ class Business extends Api
             $where['a.phone'] =['like', '%' . $keyfield . '%'];
             $where['a.phone'] =['like', '%' . $keyfield . '%'];
             $where['a.order_no'] = ['like', '%' . $keyfield . '%'];
             $where['a.order_no'] = ['like', '%' . $keyfield . '%'];
         }
         }
-        $field = "a.id,a.order_no,a.name,a.phone,a.type,b.title";
+        $field = "a.price,b.image,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')
         $order=Db::name('verification_order')
             ->alias('a')
             ->alias('a')
             ->join('verification_activity b','a.verification_activity_id=b.id')
             ->join('verification_activity b','a.verification_activity_id=b.id')
@@ -176,6 +187,11 @@ class Business extends Api
             ->field($field)
             ->field($field)
             ->paginate($total, false, ['page' => $page])
             ->paginate($total, false, ['page' => $page])
             ->toArray();
             ->toArray();
+        foreach ($order['data'] as $key => $value) {
+            if ($order['data'][$key]['image']) {
+                $order['data'][$key]['image'] = $this->url_h5 . $order['data'][$key]['image'];
+            }
+        }
         $this->success('查询成功',$order);
         $this->success('查询成功',$order);
     }
     }
 
 
@@ -188,15 +204,32 @@ class Business extends Api
         $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";
         $order=Db::name('verification_order')
         $order=Db::name('verification_order')
             ->alias('a')
             ->alias('a')
-            ->join('verification_activity b','a.verification_activity_id=b.id')
             ->where($where)
             ->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();
             ->find();
         //查询具体卡卷
         //查询具体卡卷
-        $receivewhere['verification_order_id']=['=',$order['id']];
-        $receive=Db::name("verification_receive")->where($receivewhere)->select();
-        $order['receive']=$receive;
-        $this->success('查询成功',$order);
+        if($order){
+            $receivewhere['verification_order_id']=$id;
+
+            $receive=Db::name('verification_receive')
+                ->alias('a')
+                ->join('verification_coupon b','a.verification_coupon_id=b.id')
+                ->field("a.id,b.name,b.type,b.voucher_amount,b.gift,b.consumption,b.reduction,b.consumption_name,b.image,DATE_FORMAT(FROM_UNIXTIME(b.closetime), '%Y-%m-%d %H:%i:%S') AS closetime")
+                ->where($receivewhere)->select();
+            $order['receive']=$receive;
+
+
+            foreach ($order['receive'] as $key => $value) {
+                if($order['receive'][$key]['image']){
+                    $order['receive'][$key]['image']=$this->url_h5.$order['receive'][$key]['image'];
+                }
+            }
+            $this->success("查询成功",$order);
+        }else{
+            $this->error("查询失败");
+        }
     }
     }
 
 
     /**
     /**

@@ -166,13 +166,13 @@ class Client extends Base
      */
      */
     public function orderinfo(){
     public function orderinfo(){
         $order_id=$this->postParam['id'];
         $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;
         $verification_store_id=$this->store_id;
         $where['a.verification_store_id']=$verification_store_id;
         $where['a.verification_store_id']=$verification_store_id;
-
         $order=Db::name('verification_order')
         $order=Db::name('verification_order')
             ->alias('a')
             ->alias('a')
+            ->where($where)
             ->join('verification_store b','a.verification_store_id=b.id')
             ->join('verification_store b','a.verification_store_id=b.id')
             ->join('verification_activity c','a.verification_activity_id=c.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')
             ->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')