teac

application/admin/controller/user/User.php

@@ -10,7 +10,7 @@ use Exception;
 use fast\GoogleAuthenticator;
 use fast\Asset;
 use fast\Common;
-use fast\MembershipLevel;
+use app\common\model\LedgerTeacChangeModel;
 use think\Db;
 use think\exception\DbException;
 
@@ -113,6 +113,7 @@ class User extends Backend
             $wallet             = (new LedgerWalletModel())->get($ids);
             $row['token']       = $wallet['token'] ?? "-";
             $row['frozen']      = $wallet['frozen'] ?? "-";
+            $row['teac']        = $wallet['teac'] ?? "-";
             //$google=new GoogleAuthenticator();
             //生成验证秘钥
             //$secret=$google->createSecret();
@@ -137,8 +138,10 @@ class User extends Backend
             if (bccomp($newPower, 0, 6) !== 0) {
                 if (empty($params['type_id'])) {
                     (new LedgerWalletModel)->changeWalletAccount($ids, Asset::TOKEN, $newPower, LedgerTokenChangeModel::System);
-                }else{
+                }elseif($params['type_id'] == 1){
                     (new LedgerWalletModel)->changeWalletAccount($ids, Asset::FROZEN, $newPower, LedgerFrozenChangeModel::System);
+                }else{
+                    (new LedgerWalletModel)->changeWalletAccount($ids, Asset::TEAC, $newPower, LedgerTeacChangeModel::System);
                 }
             }
             // 提交事务

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

@@ -20,15 +20,19 @@
               <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">
+          <div class="col-xs-12 col-sm-1">
               <label class="control-label col-xs-12 col-sm-2">{$row.frozen}</label>
           </div>
+          <label class="control-label col-xs-12 col-sm-2">TeaC:</label>
+          <div class="col-xs-12 col-sm-1">
+              <label class="control-label col-xs-12 col-sm-2">{$row.teac}</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=>__('茶宝手续费')])}
+             {:build_radios('row[type_id]', [0=>__('茶宝'), 1=>__('茶宝手续费'), 2=>__('TeaC')])}
         </div>
       </div>
       <div class="form-group">

application/api/logic/PledgeLogic.php

@@ -22,6 +22,7 @@ class PledgeLogic
     public  static function getByProductIdList(object $list, string $lan = 'zh')
     {
         $model  = Loader::model('ProductLists');
+        
         foreach ($list as &$item) {
             $item['product_list'] = $model->whereIn('id', $item->product_id);
             if($item->type_id == ProductPledges::Combin) $item['product_list'] = $model->orderRaw('field(id,'. $item->product_id.')');

application/common/model/LedgerTeacChangeModel.php

@@ -19,6 +19,7 @@ class LedgerTeacChangeModel extends Model
     const SellCancel       = 5;
     const Exchange         = 6;
     const PledgeFee        = 7; //存储服务费
+    const System           = 9; //系统调整
     /*
      * 支付状态
      * 0未支付 100支付中 200支付成功 400支付失败
@@ -33,6 +34,7 @@ class LedgerTeacChangeModel extends Model
         self::SellCancel       => 'C2C取消出售',
         self::Exchange         => 'Teac兑换',
         self::PledgeFee        => '存储服务费',
+        self::System           => '系统调整',
     ];
 
     //getStatusList
@@ -47,6 +49,7 @@ class LedgerTeacChangeModel extends Model
             self::SellCancel   => __('C2C取消出售'),
             self::Exchange     => __('C2C兑换产品'),
             self::PledgeFee    => __('存储服务费'),
+            self::System       => __('系统调整'),
         ];
     }
 }

public/assets/js/backend/ledger/ledger_teac_change.js

@@ -42,7 +42,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                 '5': '取消出售',
                                 '6': 'Teac兑换',
                                 '7': '存储服务费',
-                                '99': '系统调整',
+                                '9': '系统调整',
                             }, operate: 'FIND_IN_SET', formatter: Table.api.formatter.label
                         },
                     ]