|
@@ -13,13 +13,21 @@ class Userwallet extends Api
|
|
|
protected $noNeedLogin = [];
|
|
|
protected $noNeedRight = ['*'];
|
|
|
|
|
|
+ //我的钱包余额
|
|
|
+ public function my_wallet(){
|
|
|
+ $wallet = model('wallet')->getwallet($this->auth->id);
|
|
|
+ $this->success('success',$wallet);
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
//充值记录
|
|
|
public function gold_recharge_log(){
|
|
|
$map = [
|
|
|
'user_id' => $this->auth->id,
|
|
|
'log_type'=> 10,
|
|
|
];
|
|
|
- $list = Db::name('user_wallet_log')->field('id,change_value,remain,createtime')->where($map)->order('id desc')->autopage()->select();
|
|
|
+ $list = Db::name('user_gold_log')->field('id,change_value,remain,createtime')->where($map)->order('id desc')->autopage()->select();
|
|
|
|
|
|
$this->success('success',$list);
|
|
|
}
|
|
@@ -31,7 +39,7 @@ class Userwallet extends Api
|
|
|
'user_id' => $this->auth->id,
|
|
|
'log_type'=> ['IN',[21,22,23]],
|
|
|
];
|
|
|
- $income_sum = Db::name('user_wallet_log')->where($map)->sum('change_value');
|
|
|
+ $income_sum = Db::name('user_money_log')->where($map)->sum('change_value');
|
|
|
|
|
|
//可提现总收益
|
|
|
$money_remain = model('wallet')->getwallet($this->auth->id,'money');
|
|
@@ -40,7 +48,7 @@ class Userwallet extends Api
|
|
|
$start = strtotime(date('Y-m-d'));
|
|
|
$end = $start + 86399;
|
|
|
$map['createtime'] = ['between',[$start,$end]];
|
|
|
- $today_income_sum = Db::name('user_wallet_log')->where($map)->sum('change_value');
|
|
|
+ $today_income_sum = Db::name('user_money_log')->where($map)->sum('change_value');
|
|
|
|
|
|
$result = [
|
|
|
'income_sum' => $income_sum,
|
|
@@ -51,8 +59,8 @@ class Userwallet extends Api
|
|
|
$this->success('success',$result);
|
|
|
}
|
|
|
|
|
|
- //我的钱包日志
|
|
|
- public function my_wallet_log(){
|
|
|
+ //我的余额日志
|
|
|
+ public function my_money_log(){
|
|
|
$type = input_post('type',0);
|
|
|
|
|
|
$map = [
|
|
@@ -62,7 +70,35 @@ class Userwallet extends Api
|
|
|
$map['log_type'] = $type;
|
|
|
}
|
|
|
|
|
|
- $list = Db::name('user_wallet_log')->field('id,change_value,remain,createtime')->where($map)->order('id desc')->autopage()->select();
|
|
|
+ $list = Db::name('user_money_log')->field('id,log_type,change_value,remain,createtime')->where($map)->order('id desc')->autopage()->select();
|
|
|
+ if(!empty($list)){
|
|
|
+ $conf = config('wallet.logtype');
|
|
|
+ foreach($list as $key => $val){
|
|
|
+ $list[$key]['log_text'] = isset($conf[$val['log_type']]) ? $conf[$val['log_type']] : '';
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ $this->success('success',$list);
|
|
|
+ }
|
|
|
+
|
|
|
+ //金币日志
|
|
|
+ public function my_gold_log(){
|
|
|
+ $type = input_post('type',0);
|
|
|
+
|
|
|
+ $map = [
|
|
|
+ 'user_id' => $this->auth->id,
|
|
|
+ ];
|
|
|
+ if($type){
|
|
|
+ $map['log_type'] = $type;
|
|
|
+ }
|
|
|
+
|
|
|
+ $list = Db::name('user_gold_log')->field('id,log_type,change_value,remain,createtime')->where($map)->order('id desc')->autopage()->select();
|
|
|
+ if(!empty($list)){
|
|
|
+ $conf = config('wallet.logtype');
|
|
|
+ foreach($list as $key => $val){
|
|
|
+ $list[$key]['log_text'] = isset($conf[$val['log_type']]) ? $conf[$val['log_type']] : '';
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
$this->success('success',$list);
|
|
|
}
|