提货

application/api/controller/Order.php

@@ -181,16 +181,17 @@ class Order extends Api
             //扣除余额记录 
             $ledgerWalletModel->changeWalletAccount($this->auth->id, Asset::TOKEN, -$order_info['price'], $ledgerWalletModel::Payment, $order_info['user_id']);
             
-            //扣除Rwa有效  
-            if($popular_order->popular_price > config('min_rwa_price')) $userModel::updateForRwaNum($order_info['user_id'], $userModel::getByParentId($order_info['user_id']), 1, '-');
-       
+
             //增加转让人余额
             $amount = bcsub($order_info['price'], $order_info['fees'], 2);
             $ledgerWalletModel->changeWalletAccount($order_info['user_id'], Asset::TOKEN, $amount, $ledgerWalletModel::Receive, $this->auth->id);
 
-            //增加Rwa有效
-            if($popular_order->popular_price > config('min_rwa_price')) $userModel::updateForRwaNum($this->auth->id, $this->auth->parent_id, 1, '+');
-
+            if($popular_order->popular_price > config('min_rwa_price')) {
+                //扣除转让人Rwa有效  
+                $userModel::updateForRwaNum($order_info['user_id'], $userModel::getByParentId($order_info['user_id']), 1, '-');
+                //增加购买Rwa有效
+                $userModel::updateForRwaNum($this->auth->id, $this->auth->parent_id, 1, '+');
+            }
             //修改原订单状态
             $popular_order->status=$productOrder::Closure;
             $popular_order->save();

application/common/model/LedgerWalletModel.php

@@ -207,7 +207,6 @@ class LedgerWalletModel extends Model
         if (empty($available)) {
             throw new Exception('用户资产信息不存在');
         }
-
         // 金额为0的判断
         $amount = bcadd($amount, 0, 6);
         if (bccomp($amount, '0', 6) == 0) {
@@ -233,7 +232,7 @@ class LedgerWalletModel extends Model
         if (empty($changeRs)) {
             throw new Exception('更新' . $asset . '余额失败');
         }
-        return $newAmount;
+        return $totalAmount;
     }
 
     /**