edit

database/yspay_merchant_log.php

@@ -59,6 +59,18 @@ return array
             'list'      => 'Dever::load("pay/yspay_merchant-one#name", "{merchant_id}")',
         ),
 
+        'name'      => array
+        (
+            'type'      => 'varchar-100',
+            'name'      => '操作人',
+            'default'   => '',
+            'desc'      => '操作人',
+            'match'     => 'option',
+            'list_name' => '操作人',
+            'list'      => true,
+            'list_order' => 100,
+        ),
+
         'type'      => array
         (
             'type'      => 'int-11',

yspay/Cash.php

@@ -241,13 +241,17 @@ class Cash
     	$cash = Dever::param('cash', $data);
     	$merchant = Dever::db('pay/yspay_merchant')->one($merchant_id);
     	if ($merchant) {
-    		$this->tixian_act($merchant, $cash);
+    		$admin = Dever::load('manage/auth.info');
+    		$this->tixian_act($merchant, $cash, $admin['username']);
     	}
     	return false;
     }
 
-    public function tixian_act($merchant, $cash)
+    public function tixian_act($merchant, $cash, $name = '')
     {
+    	if ($cash <= 0) {
+    		Dever::alert('提现金额应大于0');
+    	}
     	$cash = $cash*$this->num;
 		$yue = $merchant['hf_cash'] - $merchant['hf_tx_cash'] - $this->num*$this->bfj;
 		if ($yue < $cash) {
@@ -260,7 +264,7 @@ class Cash
 		$status = $this->huafu_act($info);
 		if ($status == 1) {
 			Dever::db('pay/yspay_merchant')->updateTxCash(array('where_id' => $merchant['id'], 'hf_tx_cash' => $cash));
-			Dever::load('pay/yspay/merchant')->log($merchant['id'], $merchant['account_id'], 3, $cash);
+			Dever::load('pay/yspay/merchant')->log($merchant['id'], $merchant['account_id'], 3, $cash, $name);
 		}
     }
 }

yspay/Merchant.php

@@ -150,7 +150,7 @@ class Merchant
         }
     }
 
-    public function log($merchant_id, $account_id, $type, $cash)
+    public function log($merchant_id, $account_id, $type, $cash, $name)
     {
         $merchant = Dever::db('pay/yspay_merchant')->one(array('id' => $merchant_id, 'clear' => true));
         if ($merchant) {
@@ -161,6 +161,7 @@ class Merchant
             $data['type'] = $type;
             $data['cash'] = $cash;
             $data['yue'] = $yue;
+            $data['name'] = $name;
             Dever::db('pay/yspay_merchant_log')->insert($data);
         }
     }