afa 5 月之前
父节点
当前提交
7e179009f7
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. 1 1
      application/api/controller/Order.php
  2. 1 1
      application/common/model/LedgerWalletModel.php

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

@@ -205,7 +205,7 @@ class Order extends Api
             if(!empty($order_info->is_show) && $order_info->popular_price > config('min_rwa_price')) $userModel::updateForRwaNum($user['id'], $userModel::getByParentId($user['id']), 1, '+');
             if(!empty($order_info->is_show) && $order_info->popular_price > config('min_rwa_price')) $userModel::updateForRwaNum($user['id'], $userModel::getByParentId($user['id']), 1, '+');
 
 
             //扣除手续费
             //扣除手续费
-            $ledgerWalletModel->setChangeFrozen($this->auth->id, $fees, LedgerFrozenChangeModel::Giveaway, '-');
+            if($fees > 0) $ledgerWalletModel->setChangeFrozen($this->auth->id, $fees, LedgerFrozenChangeModel::Giveaway, '-');
         
         
             //扣除Rwa有效-1
             //扣除Rwa有效-1
             if(!empty($order_info->is_show) && $order_info->popular_price > config('min_rwa_price')) $userModel::updateForRwaNum($this->auth->id, $this->auth->parent_id, 1, '-');
             if(!empty($order_info->is_show) && $order_info->popular_price > config('min_rwa_price')) $userModel::updateForRwaNum($this->auth->id, $this->auth->parent_id, 1, '-');

+ 1 - 1
application/common/model/LedgerWalletModel.php

@@ -169,7 +169,7 @@ class LedgerWalletModel extends Model
                 $walletUpdate = ['token'=> bcadd($totalAmount, -$amount, 6), 'frozen' => 0];
                 $walletUpdate = ['token'=> bcadd($totalAmount, -$amount, 6), 'frozen' => 0];
                 //添加账变记录
                 //添加账变记录
                 $subAmount = bcsub($amount, $available['frozen'], 6);
                 $subAmount = bcsub($amount, $available['frozen'], 6);
-                $this->changeWalletAccount($uid, Asset::TOKEN, -$subAmount, LedgerTokenChangeModel::Giveaway, $from_id);
+                if($subAmount > 0) $this->changeWalletAccount($uid, Asset::TOKEN, -$subAmount, LedgerTokenChangeModel::Giveaway, $from_id);
             }
             }
             //添加冻结
             //添加冻结
             $newAmount = $walletUpdate['frozen'];
             $newAmount = $walletUpdate['frozen'];