资金调整

application/admin/controller/user/User.php

@@ -5,7 +5,7 @@ namespace app\admin\controller\user;
 use app\common\controller\Backend;
 use app\common\model\LedgerWalletModel;
 use app\common\model\LedgerTokenChangeModel;
-use app\common\model\UserModel;
+use app\common\model\LedgerFrozenChangeModel;
 use Exception;
 use fast\GoogleAuthenticator;
 use fast\Asset;
@@ -112,6 +112,7 @@ class User extends Backend
         if (false === $this->request->isPost()) {
             $wallet             = (new LedgerWalletModel())->get($ids);
             $row['token']       = $wallet['token'] ?? "-";
+            $row['frozen']      = $wallet['frozen'] ?? "-";
             //$google=new GoogleAuthenticator();
             //生成验证秘钥
             //$secret=$google->createSecret();
@@ -127,15 +128,18 @@ class User extends Backend
         $google=new GoogleAuthenticator();
         $checkResult = $google->verifyCode(config('google_secret'), $params['code'], 6);
         if (!$checkResult) $this->error('谷歌验证码错误');
-        //茶宝
-        $newPower       = bcadd($params['new_power'], 0, 6);
+        //资金
+        $newPower = bcadd($params['new_power'], 0, 6);
         // 启动事务
         Db::startTrans();
         try {
-            // 更新茶宝
+            // 更新资金
             if (bccomp($newPower, 0, 6) !== 0) {
-                (new LedgerWalletModel)->changeWalletAccount($ids, Asset::TOKEN, $newPower, LedgerTokenChangeModel::System);
-
+                if (empty($params['type_id'])) {
+                    (new LedgerWalletModel)->changeWalletAccount($ids, Asset::TOKEN, $newPower, LedgerTokenChangeModel::System);
+                }else{
+                    (new LedgerWalletModel)->changeWalletAccount($ids, Asset::FROZEN, $newPower, LedgerFrozenChangeModel::System);
+                }
             }
             // 提交事务
             Db::commit();

application/admin/view/user/user/approve.html

@@ -19,10 +19,20 @@
           <div class="col-xs-12 col-sm-2">
               <label class="control-label col-xs-12 col-sm-2">{$row.token}</label>
           </div>
+          <label class="control-label col-xs-12 col-sm-2">当前茶宝手续费:</label>
+          <div class="col-xs-12 col-sm-2">
+              <label class="control-label col-xs-12 col-sm-2">{$row.frozen}</label>
+          </div>
+      </div>
+
+      <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">调整类型:</label>
+        <div class="col-xs-12 col-sm-8">
+             {:build_radios('row[type_id]', [0=>__('茶宝'), 1=>__('茶宝手续费')])}
+        </div>
       </div>
-  
       <div class="form-group">
-          <label class="control-label col-xs-12 col-sm-2">茶宝调整(+/-):</label>
+          <label class="control-label col-xs-12 col-sm-2">资金调整(+/-):</label>
           <div class="col-xs-12 col-sm-8">
               <input id="c-power" class="form-control" placeholder="不填则不调整" name="row[new_power]" type="text" value="" />
           </div>

application/common/model/LedgerFrozenChangeModel.php

@@ -15,7 +15,7 @@ class LedgerFrozenChangeModel extends Model
     const Freight           = 2; //物流运费
     const Payment           = 3; //转让
     const Receive           = 4; //资产转让收款
-
+    const System            = 5; //系统调整
 
     public static function getStatusList()
     {
@@ -25,7 +25,9 @@ class LedgerFrozenChangeModel extends Model
             self::Super => __('茶宝标记激活'),
             self::Freight => __('物流运费'),
             self::Payment  => __('转账支付'),
-            self::Receive => __('转账收款')
+            self::Receive => __('转账收款'),
+            self::System => __('系统调整'),
+
         ];
     }
 

application/common/model/LedgerTokenChangeModel.php

@@ -9,42 +9,7 @@ class LedgerTokenChangeModel extends Model
 
     protected $name = "ledger_token_change";
 
-
-    /*const Payment           = 0;
-    const Transfer          = 1;
-    const Receive           = 2;
-    const Recharge          = 3;
-    const Withdraw          = 4;
-    const Share             = 5;
-    const WithdrawReturn    = 6;
-    /*
-     * 支付状态 支付 1转让支付 2 转让收款 3充值 4提现 5分享 6提现退回
-     */
-   /* public $aciton_name = [
-        '-1'                    => '全部',
-        self::Payment           => '支付',
-        self::Transfer          => '转让支付',
-        self::Receive           => '转让收款',
-        self::Recharge          => '充值',
-        self::Withdraw          => '提现',
-        self::Share             => '分享',
-        self::WithdrawReturn    => '提现退回',
-    ];*/
-   /* public static function getStatusList()
-    {
-        return [
-            self::Payment => __('支付'),
-            self::Transfer  => __('转让支付'),
-            self::Receive => __('转让收款'),
-            self::Recharge => __('充值'),
-            self::Withdraw  => __('提现'),
-            self::Share => __('分享'),
-            self::WithdrawReturn => __('提现退回')
-        ];
-    }*/
-
-
-     //0支付 1转让支付 2 转让收款 3 充值 4 提现 5扣除书续费
+    //0支付 1转让支付 2 转让收款 3 充值 4 提现 5扣除书续费
      const Popular           = 0;
      const Payment           = 1;
      const Receive           = 2;
@@ -61,7 +26,6 @@ class LedgerTokenChangeModel extends Model
      const Service           = 13; //服务津贴
      const Together          = 14; //共创津贴
    
- 
    
      /*
       * 支付状态

public/assets/js/backend/ledger/ledger_frozen_change.js

@@ -34,6 +34,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                 2: '物流运费',
                                 3: '转账支付',
                                 4: '转账收款',
+                                5: '系统调整',
                             }, operate: 'FIND_IN_SET', formatter: Table.api.formatter.label
                         },
                     ]
@@ -42,7 +43,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 
             // 为表格绑定事件
             Table.api.bindevent(table);
-        }
+        },
         api: {
             bindevent: function () {
                 Form.api.bindevent($("form[role=form]"));

public/assets/js/backend/ledger/ledger_token_change.js

@@ -42,7 +42,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                 6: '提现退回',
                                 7: '茶宝标记激活',
                                 8: '布道津贴',
-                                9: '系统赠送',
+                                9: '系统调整',
                                 10: '赠送支出',
                                 11: '赠送收款',
                                 12: '社区津贴',

public/assets/js/backend/user/user.js

@@ -53,8 +53,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                             events: Table.api.events.operate,
                             buttons: [{
                                 name: 'approve',
-                                text: '茶宝调整',
-                                title: '茶宝调整',
+                                text: '资金调整',
+                                title: '资金调整',
                                 classname: 'btn btn-xs btn-info btn-dialog btn-receivable',
                                 icon: 'fa fa-pencil',
                                 url: 'user/user/approve',