统计log_type

application/admin/controller/agent/Dashboard.php

@@ -66,7 +66,7 @@ class Dashboard extends Backend
             $lower_user_ids = Db::name('user')->where(['intro_uid' => $user_id])->column('id');
             $lower_user_ids = $lower_user_ids ? : [];
             //收益type
-            $income_type = [21, 22, 23, 54, 60, 82];
+            $income_type = [21, 22, 23, 54, 60, 72, 82, 112];
 
             /**
              * 今日概览

application/api/controller/Active.php

@@ -274,7 +274,7 @@ class Active extends Api
 
     //我今天的应得气泡数量
     private function get_qipao_count(){
-        $xiaofei_log_type = '11,12,13,53,59,71,81';//消费金币的log
+        $xiaofei_log_type = '11,12,13,53,59,71,81,111';//消费金币的log
 
         $xiaofei_total = Db::name('user_gold_log')->whereTime('createtime','today')->where('user_id',$this->auth->id)->where('log_type','IN',$xiaofei_log_type)
             ->sum('change_value');
@@ -299,7 +299,7 @@ class Active extends Api
 
     //奖池金额
     private function jiangchi(){
-        $xiaofei_log_type = '11,12,13,53,59,71,81';//消费金币的log
+        $xiaofei_log_type = '11,12,13,53,59,71,81,111';//消费金币的log
 
         //奖池为昨日平台消费总金额百分比
         $starttime = strtotime(date('Y-m-d')) - 86400;

application/api/controller/Userintro.php

@@ -20,7 +20,7 @@ class Userintro extends Api
         $end   = $start + 86399;
 
         //收益type
-        $profit_type = [21,22,23,52,54,56];
+        $profit_type = [21,22,23,52,54,56,60,72,82,112];
 
         //今日收益
         $map = [
@@ -107,7 +107,7 @@ class Userintro extends Api
         $end   = $start + 86399;
 
         //收益type
-        $profit_type = [21,22,23,52,54,56];
+        $profit_type = [21,22,23,52,54,56,60,72,82,112];
 
         //今日收益
         $map = [
@@ -156,7 +156,7 @@ class Userintro extends Api
 
     //邀请收益
     public function introincome() {
-        $list = Db::name('user_money_log')->field('user_id, sum(change_value) sum')->where(['log_type' => ['in', [65, 66]]])->group('user_id')->order('sum desc')->autopage()->select();
+        $list = Db::name('user_money_log')->field('user_id, sum(change_value) sum')->where(['log_type' => ['in', [65, 68]]])->group('user_id')->order('sum desc')->autopage()->select();
         if (!$list) {
             $this->success('success', $list);
         }

application/api/controller/Userwallet.php

@@ -118,7 +118,7 @@ class Userwallet extends Api
         $end = $start + 86399;
 
         //收益type
-        $profit_type = [21,22,23,54,58,60,67];
+        $profit_type = [21,22,23,52,54,56,60,72,82,112];
 
         //今日收益
         $today_map = [

application/common/model/Wallet.php

@@ -158,7 +158,7 @@ class Wallet extends Model
             $wallet_data[$accountType] = $data['remain'];
             if ($is_pay_get == 1) { //累计充值:后台充值updategold，支付充值gold_notify_do
                 $wallet_data['pay_money'] = bcadd($wallet['pay_money'], bcdiv($number, config('site.rmb_to_gold'), 2)); //pay_money第1处修改
-            } elseif ($is_pay_get == 2) { //累计获得：聊天礼物得收益，动态礼物得收益，私聊+语音+视频得收益，被守护得收益，被绑定关系
+            } elseif ($is_pay_get == 2) { //累计获得：聊天礼物得收益，动态礼物得收益，私聊+语音+视频得收益，被守护得收益，被绑定关系，付费图片收益
                 $wallet_data['get_money'] = bcadd($wallet['get_money'], $number);  //get_money第1处修改，也是唯一一处
             }
             $rs1 = Db::name('user_wallet')->where(['user_id'=>$user_id])->update($wallet_data);

application/extra/wallet.php

@@ -51,6 +51,9 @@ return [
         91 => '抽奖中奖',//gold增加
 
         101 => 'vip充值金币赠送',//gold增加
+
+        111 => '解锁付费图片',//gold减少
+        112 => '付费图片收益',//money增加
     ],
     'moneyname' => [
         'money'    => '积分',