edit

yspay/Cash.php

@@ -86,7 +86,7 @@ class Cash
 	    					if ($admin) {
 	    						$name = $admin['username'];
 	    					}
-	    					Dever::load('pay/yspay/merchant')->log($info['merchant_id'], $info['account_id'], 3, $info['hf_cash'], $name);
+	    					Dever::load('pay/yspay/merchant')->log($info['merchant_id'], $info['account_id'], 1, $info['hf_cash'], $name);
 
 	    					Dever::db('pay/yspay_merchant')->update(array('where_id' => $info['merchant_id'], 'cash' => $total['cash'], 'hf_cash' => $total['hf_cash'], 'fz_cash' => $total['fz_cash']));
 	    				}

yspay/Merchant.php

@@ -154,6 +154,9 @@ class Merchant
     {
         $merchant = Dever::db('pay/yspay_merchant')->one(array('id' => $merchant_id, 'clear' => true));
         if ($merchant) {
+            if (!$merchant['hf_cash']) {
+                $merchant['hf_cash'] = $cash;
+            }
             $yue = $merchant['hf_cash'] - $merchant['hf_tx_cash'];
             $data = array();
             $data['account_id'] = $account_id;

yspay/Multi.php

@@ -77,8 +77,8 @@ class Multi
             'ps' => $merchant['name'] . '分账',
         ];
         Dever::log($content, 'yspay_fenzhang');
-        //$result = $this->curl('202004', $content);
-        $result = 'ok';
+        $result = $this->curl('202004', $content);
+        //$result = 'ok';
         if ($result == 'ok') {
         	$data['status'] = 1;
         } else {