Browse Source

手续费账户

afa 7 months ago
parent
commit
f5b6a84d3f

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

@@ -51,7 +51,7 @@ class Ledger extends Api
                 'amount'    => $wallet->teac,
                 'frozen_amount'=> 0 //冻结金额
             ],[
-                'coin_name' => '茶宝(标记账户)',
+                'coin_name' => '茶宝(手续费账户)',
                 'coin_key'  => 'frozen', 
                 'amount'    => $wallet->frozen,
                 'frozen_amount'=> 0 //冻结金额

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

@@ -106,7 +106,7 @@ class Order extends Api
             if($order_info->popular_price > config('min_rwa_price')) $userModel::updateForRwaNum($order_info->user_id, $userModel::getByParentId($order_info->user_id), 1, '-');
 
             //扣除运费
-            if($order_info->freight > 0) $ledgerWalletModel->setChangeFrozen($this->auth->id, $order_info->freight, LedgerFrozenChangeModel::Freight, '-');
+            //if($order_info->freight > 0) $ledgerWalletModel->setChangeFrozen($this->auth->id, $order_info->freight, LedgerFrozenChangeModel::Freight, '-');
   
             $order_info->status= $productOrder::Shipped; 
             $order_info->save();

+ 2 - 2
application/api/lang/zh-cn.php

@@ -141,7 +141,7 @@ return [
     '质押商品数量与订单数量不匹配'                                                 => '质押商品数量与订单数量不匹配',   
     '质抵活动不存在'                                                              => '质抵活动不存在',  
     '质抵活动已结束'                                                              => '质抵活动已结束',
-    '正在挖矿中,请稍后再试'                                                        => '正在挖矿中,请稍后再试',
-    '转账后余额不能低于9.9'                                                         => '转账后余额不能低于9.9', 
+    '正在挖矿中,请稍后再试'                                                       => '正在挖矿中,请稍后再试',
+    '转账后余额不能低于9.9'                                                        => '转账后余额不能低于9.9', 
 
 ];