签到和任务都赠送钻石

application/admin/lang/zh-cn/signin.php

@@ -3,5 +3,5 @@
 return [
     'Id'      => 'ID',
     'Title'   => '标题',
-    'Goldnum' => '金币数量'
+    'Goldnum' => '钻石数量'
 ];

application/api/controller/Task.php

@@ -30,7 +30,6 @@ class Task extends Api
         $urlArr = ["1"=>"android_url","2"=>"ios_url"];
         $jump_url = $urlArr[$plat];
 
-        $bili  = config('site.money_to_gold');    //钱和金币兑换比例
         if($type_id == 2) {
 
             // 获取所有基础任务
@@ -77,10 +76,6 @@ class Task extends Api
                         $taskList[$k]["pace_txt"] = "0/".$v["number"];
                     }
 
-                    //女用户获得钱
-                    if ($this->auth->gender == 0) {
-                        $taskList[$k]['exp'] = bcdiv($v['exp'], $bili,2); //对应积分
-                    }
                 }
             }
         } else {
@@ -104,13 +99,9 @@ class Task extends Api
                     $v["finish_number"] || $taskList[$k]["finish_number"] = 0;
                     $v["is_reward"] || $taskList[$k]["is_reward"] = 0;
                     if($v["is_finish"] != 1 && $v["pace"] != 0) {
-                        $taskList[$k]["pace_txt"] = $v["finish_number"]."/".$v["number"];
+                        $taskList[$k]["pace_txt"] = $v["finish$_number"]."/".$v["number"];
                     }
 
-                    //男女用户同意获得金币
-                    /*if ($this->auth->gender == 0) {
-                        $taskList[$k]['exp'] = bcdiv($v['exp'], $bili,2); //对应人民币
-                    }*/
                 }
             }
         }
@@ -149,7 +140,7 @@ class Task extends Api
         Db::startTrans();
         try{
             //增加用户金币
-            $res1 = model('wallet')->lockChangeAccountRemain($this->auth->id,0, 'gold', $taskInfo["exp"], 20, '完成' . $taskInfo['name'] . '任务', 'task_log', $tasklogInfo['id']);
+            $res1 = model('wallet')->lockChangeAccountRemain($this->auth->id,0, 'jewel', $taskInfo["exp"], 20, '完成' . $taskInfo['name'] . '任务', 'task_log', $tasklogInfo['id']);
             if ($res1['status'] === false) {
                 Db::rollback();
                 $this->error($res1['msg']);

application/api/controller/Usersign.php

@@ -91,7 +91,7 @@ class Usersign extends Api
         }
 
         //加钱
-        $rs = model('wallet')->lockChangeAccountRemain($this->auth->id,0,'gold',$data['goldnum'],41,'签到','user_sign',$log_id);
+        $rs = model('wallet')->lockChangeAccountRemain($this->auth->id,0,'jewel',$data['goldnum'],41,'签到','user_sign',$log_id);
         if($rs['status'] === false){
             Db::rollback();
             $this->error($rs['msg']);

application/extra/wallet.php

@@ -17,7 +17,7 @@ return [
         17 => '开通会员赠送金币',//gold增加
         18 => '兑换金币', //money减少
         19 => '获得兑换金币',//gold增加
-        20 => '完成任务送金币',//gold增加
+        20 => '完成任务送钻石',//jewel增加
         21 => '视频通话收益',//money增加
         22 => '语音通话收益',//money增加
         23 => '文字聊天收益',//money增加
@@ -28,7 +28,7 @@ return [
         36 => '钻石转赠',//jewel 减少
         37 => '钻石获赠',//jewel 增加
         39 => '动态赠送礼物',//jewel 减少
-        41 => '签到赠送金币',//gold增加
+        41 => '签到赠送钻石',//jewel增加
 
 
         53 => '聊天赠送礼物',// gold 减少