钱包

application/api/controller/Userwallet.php

@@ -19,60 +19,6 @@ class Userwallet extends Api
         $this->success('success',$wallet);
     }
 
-
-
-    //充值记录
-    public function gold_recharge_log(){
-        $map = [
-            'user_id' => $this->auth->id,
-            'log_type'=> 10,
-        ];
-        $list = Db::name('user_gold_log')->field('id,change_value,remain,createtime')->where($map)->order('id desc')->autopage()->select();
-
-        $this->success('success',$list);
-    }
-
-    //我的收益，三个数据
-    public function my_income_count(){
-        //累计收益,不计来源
-        $map = [
-            'user_id' => $this->auth->id,
-            //'log_type'=> ['IN',[21,22,23]],
-        ];
-        $income_sum = Db::name('user_money_log')->where($map)->sum('change_value');
-
-        //可提现总收益
-        $money_remain = model('wallet')->getwallet($this->auth->id,'money');
-
-        //今日收益
-        $start = strtotime(date('Y-m-d'));
-        $end = $start + 86399;
-        $map['createtime'] = ['between',[$start,$end]];
-        $today_income_sum = Db::name('user_money_log')->where($map)->sum('change_value');
-
-        $result = [
-            'income_sum' => $income_sum,
-            'money_remain' => $money_remain,
-            'today_income_sum' => $today_income_sum,
-        ];
-
-        $this->success('success',$result);
-    }
-
-    //追加log_text
-    private function list_appen_logtext($list){
-        if(!empty($list)){
-            $conf = config('wallet.logtype');
-            foreach($list as $key => $val){
-                $list[$key]['createtime'] = date('Y.m.d H:i');
-                $list[$key]['log_text'] = isset($conf[$val['log_type']]) ? $conf[$val['log_type']] : '';
-            }
-        }
-        return $list;
-    }
-
-
-
     //我的积分日志
     public function my_money_log(){
         $type = input_post('type',0);
@@ -85,7 +31,7 @@ class Userwallet extends Api
 //        }
 
         $list = Db::name('user_money_log')
-            ->field('id,log_type,change_value,remain,remark,createtime, remark log_text')
+            ->field('id,log_type,change_value,remain,createtime, remark log_text')
             ->where($map)->order('id desc')->autopage()->select();
 //        $list = $this->list_appen_logtext($list);
         if(!empty($list)){
@@ -104,11 +50,13 @@ class Userwallet extends Api
         $map = [
             'user_id' => $this->auth->id,
         ];
-        if($type == 19){
-            $map['log_type'] = $type;
+        if($type){
+            $map['log_type'] = $type;  //兑换记录
         }
 
-        $list = Db::name('user_gold_log')->field('id,log_type,change_value,remain,createtime, remark log_text')->where($map)->order('id desc')->autopage()->select();
+        $list = Db::name('user_gold_log')
+            ->field('id,log_type,change_value,remain,createtime, remark log_text')
+            ->where($map)->order('id desc')->autopage()->select();
 //        $list = $this->list_appen_logtext($list);
         if(!empty($list)){
             foreach($list as $key => $val){
@@ -119,6 +67,45 @@ class Userwallet extends Api
         $this->success('success',$list);
     }
 
+    //追加log_text
+    private function list_appen_logtext($list){
+        if(!empty($list)){
+            $conf = config('wallet.logtype');
+            foreach($list as $key => $val){
+                $list[$key]['createtime'] = date('Y.m.d H:i', $val['createtime']);
+                $list[$key]['log_text'] = isset($conf[$val['log_type']]) ? $conf[$val['log_type']] : '';
+            }
+        }
+        return $list;
+    }
+
+
+    //我的收益，三个数据
+    public function my_income_count(){
+        //累计收益,不计来源
+        $map = [
+            'user_id' => $this->auth->id,
+            //'log_type'=> ['IN',[21,22,23]],
+        ];
+        $income_sum = Db::name('user_money_log')->where($map)->sum('change_value');
+
+        //可提现总收益
+        $money_remain = model('wallet')->getwallet($this->auth->id,'money');
+
+        //今日收益
+        $start = strtotime(date('Y-m-d'));
+        $end = $start + 86399;
+        $map['createtime'] = ['between',[$start,$end]];
+        $today_income_sum = Db::name('user_money_log')->where($map)->sum('change_value');
+
+        $result = [
+            'income_sum' => $income_sum,
+            'money_remain' => $money_remain,
+            'today_income_sum' => $today_income_sum,
+        ];
+
+        $this->success('success',$result);
+    }
 
 
     //每日数据