同步线上代码

@@ -74,7 +74,8 @@ class Pay extends Api
                         $params['paySign'] = generate_sign($params, $config['key']);
                         $params['paySign'] = generate_sign($params, $config['key']);
                         $this->success('成功',$params);
                         $this->success('成功',$params);
                     }
                     }
-                    $this->error($result['err_code_des']);
+                    //var_dump($result);
+                $this->error($result['err_code_des']);
                 }
                 }
             }else{
             }else{
                 $this->error('无效的订单');
                 $this->error('无效的订单');
@@ -323,6 +324,7 @@ class Pay extends Api
                             $params['paySign'] = generate_sign($params, $config['key']);
                             $params['paySign'] = generate_sign($params, $config['key']);
                             $this->success('成功',$params);
                             $this->success('成功',$params);
                         }
                         }
+                        //var_dump($result);
                         $this->error($result['err_code_des']);
                         $this->error($result['err_code_des']);
 
 
                     }
                     }
@@ -513,7 +515,7 @@ class Pay extends Api
         });
         });
         $response->send();
         $response->send();
     }
     }
-    
+
     //图片支付订单结果通知（无需调用）
     //图片支付订单结果通知（无需调用）
     public function picOrderNotify(){
     public function picOrderNotify(){
         $config = config('verify.wx_pay');
         $config = config('verify.wx_pay');

@@ -1405,6 +1405,7 @@ class User extends Api
                 ->field('id,user_id,pic_id,video_id')
                 ->field('id,user_id,pic_id,video_id')
                 ->order('createtime desc,id desc')
                 ->order('createtime desc,id desc')
                 ->select();
                 ->select();
+         
             foreach ($data as &$v){
             foreach ($data as &$v){
                 if(!empty($v['pic_id'])){
                 if(!empty($v['pic_id'])){
                     $v['pic_id'] = Db::name('pic')->field('id,title,thumbnail,url,price')->where('id',$v['pic_id'])->find();
                     $v['pic_id'] = Db::name('pic')->field('id,title,thumbnail,url,price')->where('id',$v['pic_id'])->find();
@@ -1413,8 +1414,15 @@ class User extends Api
                 }
                 }
                 if(!empty($v['video_id'])){
                 if(!empty($v['video_id'])){
                     $v['video_id'] = Db::name('video')->field('keyword,type_ids,content,is_recommend,buy_num,click_num,createtime,updatetime',true)->where('id',$v['video_id'])->find();
                     $v['video_id'] = Db::name('video')->field('keyword,type_ids,content,is_recommend,buy_num,click_num,createtime,updatetime',true)->where('id',$v['video_id'])->find();
+                    if (empty($v['video_id'])){
+                        continue;
+                    }
                     $v['video_id']['thumbnail'] = $rule.$v['video_id']['thumbnail'];
                     $v['video_id']['thumbnail'] = $rule.$v['video_id']['thumbnail'];
-                    $v['video_id']['video'] = $rule.$v['video_id']['video'];
+                    if (!empty($v['video_id']['video'])){
+                        $v['video_id']['video'] = $rule.$v['video_id']['video'];
+                    }else{
+                        $v['video_id']['video'] = $rule;
+                    }
                     $v['video_id']['vipprice'] = $v['video_id']['price'] * 0.75;
                     $v['video_id']['vipprice'] = $v['video_id']['price'] * 0.75;
                     $v['video_id']['four_vipprice'] = $v['video_id']['four_price'] * 0.75;
                     $v['video_id']['four_vipprice'] = $v['video_id']['four_price'] * 0.75;
                     $v['video_id']['eight_vipprice'] = $v['video_id']['eight_price'] * 0.75;
                     $v['video_id']['eight_vipprice'] = $v['video_id']['eight_price'] * 0.75;