Просмотр исходного кода

money改名叫海钻,比例10000改成1

lizhen_gitee 1 год назад
Родитель
Сommit
efe1e887d0

+ 2 - 2
application/api/controller/Pay.php

@@ -149,7 +149,7 @@ class Pay extends Api
         }
 
         //扣除money
-        $rs_wallet = model('Wallet')->lockChangeAccountRemain($uid,$money,'-',0,'收益兑换金币',114,'money');
+        $rs_wallet = model('Wallet')->lockChangeAccountRemain($uid,$money,'-',0,'海钻兑换金币',114,'money');
         if($rs_wallet['status']===false)
         {
             Db::rollback();
@@ -157,7 +157,7 @@ class Pay extends Api
         }
 
         //增加jewel
-        $rs_wallet = model('Wallet')->lockChangeAccountRemain($uid,$jewel,'+',0,'收益兑换金币',14,'jewel');
+        $rs_wallet = model('Wallet')->lockChangeAccountRemain($uid,$jewel,'+',0,'海钻兑换金币',14,'jewel');
         if($rs_wallet['status']===false)
         {
             Db::rollback();

+ 2 - 2
application/api/controller/Userintro.php

@@ -137,9 +137,9 @@ class Userintro extends Api
         //总邀请人数
         $intro_num_all      = Db::name('user')->where('pre_userid',$this->auth->id)->count();
         //本周奖励
-        $money_sum_thisweek = Db::name('user_money_log')->where(['user_id'=>$this->auth->id,'type'=>103,'createtime'=>['BETWEEN',[$thisweek_start,$thisweek_end]]])->sum('value');
+        $money_sum_thisweek = Db::name('user_jewel_log')->where(['user_id'=>$this->auth->id,'type'=>2,'createtime'=>['BETWEEN',[$thisweek_start,$thisweek_end]]])->sum('value');
         //上周奖励
-        $money_sum_lastweek = Db::name('user_money_log')->where(['user_id'=>$this->auth->id,'type'=>103,'createtime'=>['BETWEEN',[$lastweek_start,$lastweek_end]]])->sum('value');
+        $money_sum_lastweek = Db::name('user_jewel_log')->where(['user_id'=>$this->auth->id,'type'=>2,'createtime'=>['BETWEEN',[$lastweek_start,$lastweek_end]]])->sum('value');
         //我邀请的人
         $user_list = Db::name('user')->field('id,u_id,username,nickname,mobile,avatar,createtime')->where('pre_userid',$this->auth->id)->limit(3)->select();
 

+ 4 - 4
application/extra/wallet.php

@@ -13,7 +13,7 @@ return [
         11 => '私聊转账',  //减少
         12 => '私聊到账',  //增加
         13 => '抽奖大转盘', //减少
-        14 => '余额兑换金币', //增加
+        14 => '海钻兑换金币', //增加
         16 => '签到奖励',//增加
         19 => '绑定关系',//减少
         20 => '完成任务', //增加
@@ -27,14 +27,14 @@ return [
         //money
         101 => '获赠礼物', //增加
         102 => '房间礼物抽成', //增加
-        103 => '邀请推广', //增加
+        //103 => '邀请推广', //增加
         104 => '申请提现', //减少
         105 => '申请提现驳回', //增加
-        114 => '余额兑换金币', //减少
+        114 => '海钻兑换金币', //减少
     ],
     'moneyname' => [
         'jewel'    => '金币',
-        'money'    => '余额',
+        'money'    => '海钻',
     ],
     'withdraw_type' => [
         1 => 'alipay',//支付宝