diff --git a/app/portal/controller/AdminPrizeOrderController.php b/app/portal/controller/AdminPrizeOrderController.php index 87d32b0..bbec51c 100644 --- a/app/portal/controller/AdminPrizeOrderController.php +++ b/app/portal/controller/AdminPrizeOrderController.php @@ -34,7 +34,7 @@ class AdminPrizeOrderController extends AdminBaseController ->join('prize p','po.prize_id=p.id') ->join('users u','po.users_id=u.id') ->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'); $data->appends($param); diff --git a/app/portal/controller/PrizeController.php b/app/portal/controller/PrizeController.php index e89eb26..cef044f 100644 --- a/app/portal/controller/PrizeController.php +++ b/app/portal/controller/PrizeController.php @@ -126,12 +126,16 @@ class PrizeController extends WeChatBaseController public function getPrize(){ $re=$this->checkUser(); $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; } $data['prize_id']=$id; $data['users_id']=$re['id']; $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); return 1; }