From 479287cf0d14c4194383bb77cdfb0816455e7fd6 Mon Sep 17 00:00:00 2001
From: 潘浩文 <phw@bronet.cn>
Date: Mon, 22 Oct 2018 18:00:53 +0800
Subject: [PATCH] 1
---
app/portal/controller/AdminPrizeOrderController.php | 2 +-
app/portal/controller/PrizeController.php | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
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;
}
--
libgit2 0.24.0