edit

database/info_log.php

@@ -394,5 +394,19 @@ return array
             'page' => array(10, 'list'),
             'col' => '*',
         ),
+
+        'getCash' => array
+        (
+            'type' => 'one',
+            'option' => array
+            (
+                'config_id' => 'yes',
+                'info_id' => 'yes',
+                'type_id' => 'yes',
+                'status' => array('yes', 'in'),
+                'state' => 1,
+            ),
+            'col' => 'sum(cash) as cash',
+        ),
     ),
 );

database/push.php

@@ -1,5 +1,5 @@
 <?php
-$config_id = Dever::input('search_option_config_id', 1);
+$config_id = Dever::input('set_config_id', Dever::input('search_option_config_id', 1));
 $uid = Dever::input('search_option_uid');
 
 $type = function() use($config_id) {

lib/Info.php

@@ -7,7 +7,7 @@ class Info
     public function getUserInfo($uid, $config_id = false)
     {
         $info = $this->getInfo($uid, $config_id);
-        return array('name' => $info['config']['name'], 'cash' => $info['cash']);
+        return array('name' => $info['config']['name'], 'cash' => $info['cash'], 'info_id' => $info['id']);
     }
 
     # 获取账户信息
@@ -49,7 +49,7 @@ class Info
     }
 
     # 入账
-    public function up_commit($uid, $cash, $type, $config, $desc = '', $source = '', $source_id = '', $method = 1, $state = true)
+    public function up_commit($uid, $cash, $type, $config, $desc = '', $source = '', $source_id = '', $method = 1, $state = true, $result = false)
     {
         if ($cash == 0) {
             return $this->alert('金额不能为0', $state);
@@ -170,6 +170,10 @@ class Info
             $update['clear'] = true;
             Dever::db('account/info')->$func($update);
         }
+        if ($result) {
+            $data['id'] = $id;
+            return $data;
+        }
         return $yue;
     }
 

lib/Log.php

@@ -29,6 +29,17 @@ class Log
         }
     }
 
+    # 获取某个交易类型的审核中的金额
+    public function getCash($config_id, $info_id, $type_id)
+    {
+        $where['config_id'] = $config_id;
+        $where['info_id'] = $info_id;
+        $where['status'] = '1,2';
+        $data = Dever::db('account/info_log')->getCash($where);
+        
+        return $data;
+    }
+
     # 获取日志列表
     public function getList($config_id, $info_id)
     {