rabin 1 år sedan
förälder
incheckning
8a24796d60
4 ändrade filer med 37 tillägg och 4 borttagningar
  1. 12 2
      database/yspay.php
  2. 20 0
      database/yspay_cash.php
  3. 4 1
      yspay/Cash.php
  4. 1 1
      yspay/Multi.php

+ 12 - 2
database/yspay.php

@@ -48,9 +48,9 @@ return array
 		'per'		=> array
 		(
 			'type' 		=> 'varchar-11',
-			'name' 		=> '交易手续费百分比-如输入10,就是从总支付金额中收取10%手续费,这个会自动扣掉,输入0.1就是千分之1',
+			'name' 		=> '银联交易手续费百分比-如输入10,就是从总支付金额中收取10%手续费,这个会自动扣掉,输入0.1就是千分之1',
 			'default' 	=> '10',
-			'desc' 		=> '交易手续费百分比',
+			'desc' 		=> '银联交易手续费百分比',
 			'match' 	=> 'is_numeric',
 			'update'	=> 'text',
 		),
@@ -138,6 +138,16 @@ return array
 			'show'		=> 'type=2',
 		),
 
+		'cash_jy_per'		=> array
+		(
+			'type' 		=> 'varchar-11',
+			'name' 		=> '平台交易手续费百分比-如输入10,就是从总支付金额中收取10%手续费,这个会自动扣掉,输入0.1就是千分之1',
+			'default' 	=> '10',
+			'desc' 		=> '平台交易手续费百分比',
+			'match' 	=> 'is_numeric',
+			'update'	=> 'text',
+		),
+
 		'cash_per'		=> array
 		(
 			'type' 		=> 'int-11',

+ 20 - 0
database/yspay_cash.php

@@ -78,6 +78,26 @@ return array
             'list'      => 'Dever::number({ycash}/100, 2)',
         ),
 
+        'yl_cash'      => array
+        (
+            'type'      => 'int-11',
+            'name'      => '银联手续费',
+            'default'   => '0',
+            'desc'      => '银联手续费',
+            'match'     => 'option',
+            'list'      => 'Dever::number({yl_cash}/100, 2)',
+        ),
+
+        'pt_cash'      => array
+        (
+            'type'      => 'int-11',
+            'name'      => '平台手续费',
+            'default'   => '0',
+            'desc'      => '平台手续费',
+            'match'     => 'option',
+            'list'      => 'Dever::number({pt_cash}/100, 2)',
+        ),
+
         'cash'      => array
         (
             'type'      => 'int-11',

+ 4 - 1
yspay/Cash.php

@@ -97,9 +97,12 @@ class Cash
 			}
 			
     		$per = $yspay['per']/100;
+    		$cash_jy_per = $yspay['cash_jy_per']/100;
 
         	$data['ycash'] = $amount;
-	        $data['cash'] = round($data['ycash'] - $data['ycash'] * $per, 2);
+        	$data['yl_cash'] = round($data['ycash'] * $per, 2);
+        	$data['pt_cash'] = round($data['ycash'] * $cash_jy_per, 2);
+	        $data['cash'] = round($data['ycash'] - $data['yl_cash'] - $data['pt_cash'], 2);
 	        if ($yspay['cash_type'] == 1) {
 	        	$fz_cash = $data['ycash'];
 	        } else {

+ 1 - 1
yspay/Multi.php

@@ -59,7 +59,7 @@ class Multi
     	$this->config = $config;
 
     	$mid = $merchant['mid'];
-    	$cash = $info['fz_cash'];
+    	$cash = $info['fz_cash'] + $info['pt_cash'];
     	if (!$cash || $cash <= 0) {
     		return false;
     	}