edit

database/yspay_cash.php

@@ -114,7 +114,7 @@ return array
             'default'   => '0',
             'desc'      => '交易金额',
             'match'     => 'option',
-            'list'      => 'Dever::number({ycash}/1000, 3)',
+            'list'      => 'Dever::number({ycash}/100, 2)',
         ),
 
         'yl_cash'      => array
@@ -124,7 +124,7 @@ return array
             'default'   => '0',
             'desc'      => '银联手续费',
             'match'     => 'option',
-            'list'      => 'Dever::number({yl_cash}/1000, 3)',
+            'list'      => 'Dever::number({yl_cash}/100, 2)',
         ),
 
         'pt_cash'      => array
@@ -134,7 +134,7 @@ return array
             'default'   => '0',
             'desc'      => '平台手续费',
             'match'     => 'option',
-            'list'      => 'Dever::number({pt_cash}/1000, 3)',
+            'list'      => 'Dever::number({pt_cash}/100, 2)',
         ),
 
         'cash'      => array
@@ -144,7 +144,7 @@ return array
             'default'   => '0',
             'desc'      => '实际金额',
             'match'     => 'option',
-            'list'      => 'Dever::number({cash}/1000, 3)',
+            'list'      => 'Dever::number({cash}/100, 2)',
         ),
 
         'hf_cash'      => array
@@ -155,7 +155,7 @@ return array
             'desc'      => '划付金额',
             'match'     => 'option',
             //'update'    => 'text',
-            'list'		=> 'Dever::number({hf_cash}/1000, 3)',
+            'list'		=> 'Dever::number({hf_cash}/100, 2)',
         ),
 
         'fz_cash'      => array
@@ -166,7 +166,7 @@ return array
             'desc'      => '分账金额',
             'match'     => 'option',
             //'update'    => 'text',
-            'list'		=> 'Dever::number({fz_cash}/1000, 3)',
+            'list'		=> 'Dever::number({fz_cash}/100, 2)',
         ),
 
         'fdate'     => array

database/yspay_cash_log.php

@@ -96,7 +96,7 @@ return array
             'desc'      => '提现金额',
             'match'     => 'option',
             'update'    => 'text',
-            'list'      => 'round({cash}/1000, 3)',
+            'list'      => 'round({cash}/100, 2)',
         ),
 
         'tdate'     => array

database/yspay_merchant.php

@@ -171,7 +171,7 @@ return array
             'match'     => 'option',
             //'update'    => 'text',
             'list_name' => '分账总额 / 划付总额 / 提现总额',
-            'list'      => $yspay_type == 1 ? false : 'Dever::number({fz_cash}/1000, 3) . " / " . Dever::number({hf_cash}/1000, 3) . " / " . Dever::number({hf_tx_cash}/1000, 3)',
+            'list'      => $yspay_type == 1 ? false : 'Dever::number({fz_cash}/100, 2) . " / " . Dever::number({hf_cash}/100, 2) . " / " . Dever::number({hf_tx_cash}/100, 2)',
         ),
 
         'hf_cash'      => array
@@ -182,7 +182,7 @@ return array
             'desc'      => '划付总额',
             'match'     => 'option',
             //'update'    => 'text',
-            //'list'		=> 'Dever::number({hf_cash}/1000, 2)',
+            //'list'		=> 'Dever::number({hf_cash}/100, 2)',
         ),
 
         'hf_tx_cash'      => array
@@ -193,7 +193,7 @@ return array
             'desc'      => '划付提现总额',
             'match'     => 'option',
             //'update'    => 'text',
-            //'list'        => 'Dever::number({hf_cash}/1000, 2)',
+            //'list'        => 'Dever::number({hf_cash}/100, 2)',
         ),
 
         'fz_cash'      => array
@@ -204,7 +204,7 @@ return array
             'desc'      => '分账总额',
             'match'     => 'option',
             //'update'    => 'text',
-            //'list'		=> 'Dever::number({fz_cash}/1000, 2)',
+            //'list'		=> 'Dever::number({fz_cash}/100, 2)',
         ),
 
         'yue'      => array
@@ -216,7 +216,7 @@ return array
             'match'     => 'option',
             //'update'    => 'text',
             'list_name' => '账户余额 / 提现总额',
-            'list'		=> $yspay_type == 2 ? false : 'Dever::number({yue}/1000, 3) . " / " . Dever::number({tx_cash}/1000, 3)',
+            'list'		=> $yspay_type == 2 ? false : 'Dever::number({yue}/100, 2) . " / " . Dever::number({tx_cash}/100, 2)',
         ),
 
         'tx_cash'      => array
@@ -227,7 +227,7 @@ return array
             'desc'      => '划付总额',
             'match'     => 'option',
             //'update'    => 'text',
-            //'list'		=> 'Dever::number({tx_cash}/1000, 2)',
+            //'list'		=> 'Dever::number({tx_cash}/100, 2)',
         ),
 
         'pay/yspay_sign-one#step'=> array

database/yspay_merchant_log.php

@@ -92,7 +92,7 @@ return array
             'desc'      => '交易金额',
             'match'     => 'option',
             'update'    => 'text',
-            'list'      => 'Dever::number({cash}/1000, 3)',
+            'list'      => 'Dever::number({cash}/100, 2)',
         ),
 
         'yue'      => array
@@ -103,7 +103,7 @@ return array
             'desc'      => '交易后余额',
             'match'     => 'option',
             'update'    => 'text',
-            'list'      => 'Dever::number({yue}/1000, 3)',
+            'list'      => 'Dever::number({yue}/100, 2)',
         ),
 
         'state'     => array

yspay/Cash.php

@@ -3,8 +3,8 @@ use Dever;
 
 class Cash
 {
-	# 千分制
-	private $num = 1000;
+	# 百分制
+	private $num = 100;
 	# 备付金
 	private $bfj = 100;
 	# 入账：待确认
@@ -115,7 +115,6 @@ class Cash
 
     private function getCash($amount, $merchant, &$data, $fenzhang = 0)
     {
-    	$amount = $amount*10;
     	$fenzhang = $fenzhang*$this->num;
     	$yspay = Dever::db('pay/yspay')->one(array('account_id' => $merchant['account_id']));
 		if ($yspay) {
@@ -138,8 +137,8 @@ class Cash
     		$cash_jy_per = $yspay['cash_jy_per']/100;
 
         	$data['ycash'] = $amount;
-        	$data['yl_cash'] = $data['ycash'] * $per;
-        	$data['pt_cash'] = $data['ycash'] * $cash_jy_per;
+        	$data['yl_cash'] = floor($data['ycash'] * $per);
+        	$data['pt_cash'] = floor($data['ycash'] * $cash_jy_per);
 	        $data['cash'] = $data['ycash'] - $data['yl_cash'] - $data['pt_cash'];
 
 	        /*