1

@@ -34,7 +34,7 @@ class AdminPrizeOrderController extends AdminBaseController
             ->join('prize p','po.prize_id=p.id')
             ->join('prize p','po.prize_id=p.id')
             ->join('users u','po.users_id=u.id')
             ->join('users u','po.users_id=u.id')
             ->where($where)
             ->where($where)
-            ->field('po.*,u.*,p.name,p.score as pscore,po.status as postatus')
+            ->field('po.*,p.name,p.score as pscore,po.status as postatus,u.nickname,u.mobile')
             ->paginate('15');
             ->paginate('15');
         $data->appends($param);
         $data->appends($param);
 
 

@@ -126,12 +126,16 @@ class PrizeController extends WeChatBaseController
     public function getPrize(){
     public function getPrize(){
         $re=$this->checkUser();
         $re=$this->checkUser();
         $id=$this->request->param('id');
         $id=$this->request->param('id');
-        if(Db::name('users')->where('id',$re['id'])->find()['score']<Db::name('prize')->where('id',$id)->find()['score']){
+        $users_score=Db::name('users')->where('id',$re['id'])->find()['score'];
+        $prize_score=Db::name('prize')->where('id',$id)->find()['score'];
+        if($users_score<$prize_score){
             return 0;
             return 0;
         }
         }
         $data['prize_id']=$id;
         $data['prize_id']=$id;
         $data['users_id']=$re['id'];
         $data['users_id']=$re['id'];
         $data['create_time']=time();
         $data['create_time']=time();
+        Db::name('users')->where('id',$re['id'])->setDec('score',$prize_score);
+        Db::name('users_score_log')->insert(['users_id'=>$re['id'],'create_time'=>time(),'action'=>'兑换礼品','score'=>$prize_score]);
         Db::name('prize_order')->insert($data);
         Db::name('prize_order')->insert($data);
         return 1;
         return 1;
     }
     }