rabin 1 год назад
Родитель
Сommit
72e5851b39

+ 0 - 0
database/config.php


+ 0 - 0
database/config_card.php


+ 0 - 0
database/config_profit.php


+ 0 - 0
database/config_profit_rule.php


+ 0 - 0
database/config_project.php


+ 0 - 0
database/config_type.php


+ 0 - 0
database/info.php


+ 0 - 0
database/info_log.php


+ 0 - 0
database/money.php


+ 0 - 0
database/pay.php


+ 0 - 0
database/profit.php


+ 0 - 0
database/profit_log.php


+ 0 - 0
database/push.php


+ 0 - 0
database/withdraw_info.php



+ 0 - 0
lib/Card.php


+ 0 - 0
lib/Config.php


+ 6 - 3
lib/Info.php

@@ -131,7 +131,6 @@ class Info
             if ($config['withdraw_fee']) {
                 $fee = Dever::per($cash, $config['withdraw_fee']);
                 $data['cash'] -= $fee;
-                $scash += $fee;
             }
         }
 
@@ -151,7 +150,11 @@ class Info
         }
 
         if ($info) {
-            $data['yue'] = $info['cash'] + $scash;
+            if ($type['key'] == 'tixian') {
+                $data['yue'] = $info['cash'] - $data['ycash'];
+            } else {
+                $data['yue'] = $info['cash'] + $scash;
+            }
             if ($type['type'] == 2 && $config['balance_alert'] && $data['yue'] <= $config['balance_alert']) {
                 return $this->alert('账户余额不足', $state);
             }
@@ -166,7 +169,7 @@ class Info
             $update = array();
             $update['where_id'] = $info['id'];
             $update['set_cash'] = $scash;
-            $update['set_col'] = $data['cash'];
+            $update['set_col'] = $data['ycash'];
             $update['clear'] = true;
             Dever::db('account/info')->$func($update);
         }

+ 0 - 0
lib/Log.php


+ 0 - 0
lib/Manage.php


+ 0 - 0
lib/Pay.php


+ 0 - 0
lib/Profit.php


+ 0 - 0
lib/Project.php


+ 0 - 0
src/Info.php


+ 0 - 0
src/Pay.php


+ 0 - 0
src/Profit.php


+ 0 - 0
src/Withdraw.php