edit

yspay/Cash.php

@@ -14,7 +14,7 @@ class Cash
 	        $data['source_order_num'] = $source_order_num;
 	        $info = Dever::db('pay/yspay_cash')->find($data);
 	        if ($amount && $amount > 0) {
-	        	$this->getCash($amount, $data, $merchant);
+	        	$this->getCash($amount, $merchant, $data);
 	        }
 	        
 	        $data['status'] = 1;
@@ -60,7 +60,7 @@ class Cash
 	    			$update['tdate'] = time();
 	    		} elseif ($status == 2 && $amount && $amount > 0) {
 	    			# 待入账 可以修改金额
-		        	$this->getCash($amount, $update, $merchant);
+		        	$this->getCash($amount, $merchant, $update);
 		        }
 	    		$state = Dever::db('pay/yspay_cash')->update($update);
 	    		if ($state) {