Selaa lähdekoodia

提现加费率

lizhen_gitee 11 kuukautta sitten
vanhempi
commit
237bcd2582

+ 7 - 0
application/admin/controller/Withdraw.php

@@ -106,7 +106,14 @@ class Withdraw extends Backend
                 //系统消息
                 $msg_id = \app\common\model\Message::addMessage($info['user_id'],'超推提现审核','超推提现审核已经通过');
 
+                $remark = '提现(成功)';
+                Db::name('user_agentjewel_log')->where('table','withdraw')->where('table_id',$id)->update(['remark'=>$remark]);
+
             }elseif($status == 2){
+
+                $remark = '提现(驳回)';
+                Db::name('user_agentjewel_log')->where('table','withdraw')->where('table_id',$id)->update(['remark'=>$remark]);
+
                 //还钱
                 $wallet_rs = model('wallet')->lockChangeAccountRemain($info['user_id'],'agentjewel',$info['agentjewel'],56,'超推提现被拒返回:'.$info['agentjewel'],'withdraw',$info['id']);
                 if($wallet_rs['status'] === false){

+ 5 - 1
application/admin/lang/zh-cn/withdraw.php

@@ -3,8 +3,12 @@
 return [
     'Id'            => 'ID',
     'User_id'       => '用户ID',
-    'Money'         => '提现人民币金额',
     'Agentjewel'    => '扣除超推收益金额',
+    'Huilv'         => '汇率',
+    'Money'         => '提现人民币金额',
+    'Plat_bilv'     => '平台手续费百分比',
+    'Plat_money'    => '平台手续费',
+    'Get_money'     => '用户实得人民币金额',
     'Type'          => '提现方式',
     'Type 1'        => '支付宝',
     'Type 2'        => '银行卡',

+ 26 - 2
application/admin/view/withdraw/add.html

@@ -7,15 +7,39 @@
         </div>
     </div>
     <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Agentjewel')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-agentjewel" data-rule="required" class="form-control" step="0.01" name="row[agentjewel]" type="number" value="0.00">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Huilv')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-huilv" data-rule="required" class="form-control" name="row[huilv]" type="number">
+        </div>
+    </div>
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Money')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-money" data-rule="required" class="form-control" step="0.01" name="row[money]" type="number" value="0.00">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Agentjewel')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Plat_bilv')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-agentjewel" data-rule="required" class="form-control" step="0.01" name="row[agentjewel]" type="number" value="0.00">
+            <input id="c-plat_bilv" data-rule="required" class="form-control" step="0.01" name="row[plat_bilv]" type="number" value="0.00">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Plat_money')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-plat_money" data-rule="required" class="form-control" step="0.01" name="row[plat_money]" type="number" value="0.00">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Get_money')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-get_money" data-rule="required" class="form-control" step="0.01" name="row[get_money]" type="number" value="0.00">
         </div>
     </div>
     <div class="form-group">

+ 26 - 2
application/admin/view/withdraw/audit.html

@@ -7,15 +7,39 @@
         </div>
     </div>
     <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Agentjewel')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-agentjewel" data-rule="required" disabled class="form-control" step="0.01" name="row[agentjewel]" type="number" value="{$row.agentjewel|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Huilv')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-huilv" data-rule="required" disabled class="form-control" name="row[huilv]" type="number" value="{$row.huilv|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Money')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-money" data-rule="required" disabled class="form-control" step="0.01" name="row[money]" type="number" value="{$row.money|htmlentities}">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Agentjewel')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Plat_bilv')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-agentjewel" data-rule="required" disabled class="form-control" step="0.01" name="row[agentjewel]" type="number" value="{$row.agentjewel|htmlentities}">
+            <input id="c-plat_bilv" data-rule="required" disabled class="form-control" step="0.01" name="row[plat_bilv]" type="number" value="{$row.plat_bilv|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Plat_money')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-plat_money" data-rule="required" disabled class="form-control" step="0.01" name="row[plat_money]" type="number" value="{$row.plat_money|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Get_money')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-get_money" data-rule="required" disabled class="form-control" step="0.01" name="row[get_money]" type="number" value="{$row.get_money|htmlentities}">
         </div>
     </div>
     <div class="form-group">

+ 26 - 2
application/admin/view/withdraw/edit.html

@@ -7,15 +7,39 @@
         </div>
     </div>
     <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Agentjewel')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-agentjewel" data-rule="required" class="form-control" step="0.01" name="row[agentjewel]" type="number" value="{$row.agentjewel|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Huilv')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-huilv" data-rule="required" class="form-control" name="row[huilv]" type="number" value="{$row.huilv|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Money')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-money" data-rule="required" class="form-control" step="0.01" name="row[money]" type="number" value="{$row.money|htmlentities}">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Agentjewel')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Plat_bilv')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-agentjewel" data-rule="required" class="form-control" step="0.01" name="row[agentjewel]" type="number" value="{$row.agentjewel|htmlentities}">
+            <input id="c-plat_bilv" data-rule="required" class="form-control" step="0.01" name="row[plat_bilv]" type="number" value="{$row.plat_bilv|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Plat_money')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-plat_money" data-rule="required" class="form-control" step="0.01" name="row[plat_money]" type="number" value="{$row.plat_money|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Get_money')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-get_money" data-rule="required" class="form-control" step="0.01" name="row[get_money]" type="number" value="{$row.get_money|htmlentities}">
         </div>
     </div>
     <div class="form-group">

+ 1 - 1
application/api/controller/Withdraw.php

@@ -92,7 +92,7 @@ class Withdraw extends Api
 
         //平台手续费
         $plat_bilv = config('site.withdrawal_plat_bili');
-        $plat_money = bcdiv(bcmul($money,(100-$plat_bilv),2),100,2);
+        $plat_money = bcdiv(bcmul($money,$plat_bilv,2),100,2);
 
         //减去手续费,得实得金额
         $get_money = bcsub($money,$plat_money,2);

+ 5 - 1
public/assets/js/backend/withdraw.js

@@ -28,8 +28,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'id', title: __('Id')},
 //                        {field: 'user_id', title: __('User_id')},
                         {field: 'user.username', title: __('User.username'), operate: 'LIKE'},
-                        {field: 'money', title: __('Money'), operate:'BETWEEN'},
                         {field: 'agentjewel', title: __('Agentjewel'), operate:'BETWEEN'},
+                        {field: 'huilv', title: __('Huilv')},
+                        {field: 'money', title: __('Money'), operate:'BETWEEN'},
+                        {field: 'plat_bilv', title: __('Plat_bilv'), operate:'BETWEEN'},
+                        {field: 'plat_money', title: __('Plat_money'), operate:'BETWEEN'},
+                        {field: 'get_money', title: __('Get_money'), operate:'BETWEEN'},
                         {field: 'type', title: __('Type'), searchList: {"1":__('Type 1'),"2":__('Type 2')}, formatter: Table.api.formatter.normal},
                         {field: 'account_info', title: '账号', operate:false},
                         {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},