rabin 1 year ago
parent
commit
055cf2db5e
2 changed files with 8 additions and 3 deletions
  1. 1 1
      database/yspay_cash.php
  2. 7 2
      yspay/Cash.php

+ 1 - 1
database/yspay_cash.php

@@ -245,7 +245,7 @@ return array
             'match'     => array('is_numeric', time()),
             'desc'      => '',
             # 只有insert时才生效
-            //'insert'    => true,
+            'insert'    => true,
             'search'    => 'date',
             'list'      => 'date("Y-m-d H:i:s", {cdate})',
         ),

+ 7 - 2
yspay/Cash.php

@@ -141,17 +141,22 @@ class Cash
         	$data['yl_cash'] = $data['ycash'] * $per;
         	$data['pt_cash'] = $data['ycash'] * $cash_jy_per;
 	        $data['cash'] = $data['ycash'] - $data['yl_cash'] - $data['pt_cash'];
+
+	        /*
 	        if ($yspay['cash_type'] == 1) {
 	        	$fz_cash = $data['ycash'];
 	        } else {
 	        	$fz_cash = $data['cash'];
 	        }
-	        //$data['fz_cash'] = $fz_cash*$cash_per;
+	        $data['fz_cash'] = $fz_cash*$cash_per;
+	        */
 	        $data['fz_cash'] = 0;
 	        if ($fenzhang && $fenzhang > 0) {
 	        	$data['fz_cash'] += $fenzhang;
+	        	$data['hf_cash'] = $data['cash'] - $data['fz_cash'];
+	        } else {
+	        	unset($data['fz_cash']);
 	        }
-	        $data['hf_cash'] = $data['cash'] - $data['fz_cash'];
 	    }
     }