rabin 1 rok pred
rodič
commit
8f3952e518
2 zmenil súbory, kde vykonal 6 pridanie a 5 odobranie
  1. 4 3
      lib/Yspay.php
  2. 2 2
      yspay/Cash.php

+ 4 - 3
lib/Yspay.php

@@ -185,10 +185,11 @@ class Yspay extends Core
 				$subOrders['merOrderId'] = $prefix . $v['order_id'];
 				$request['subOrders'][] = $subOrders;
 
-				if ($v['fenzhang'] > 0) {
-					$v['fenzhang'] = $v['fenzhang'] * 100;
+				$fenzhang = 0;
+				if (isset($v['fenzhang']) && $v['fenzhang'] > 0) {
+					$fenzhang = $v['fenzhang'] * 100;
 				}
-				Dever::load('pay/yspay/cash')->add($subOrders['mid'], $subOrders['totalAmount'], $subOrders['merOrderId'], $v['order_id']);
+				Dever::load('pay/yspay/cash')->add($subOrders['mid'], $subOrders['totalAmount'], $subOrders['merOrderId'], $v['order_id'], $fenzhang);
 			}
 			if ($request['subOrders']) {
 				$request['divisionFlag'] = true;

+ 2 - 2
yspay/Cash.php

@@ -32,7 +32,7 @@ class Cash
     }
 
     # 修改状态
-    public function up($id, $status = 2, $amount = false)
+    public function up($id, $status = 2, $amount = false, $fenzhang = 0)
     {
     	if ($amount) {
     		$amount = $amount * 100;
@@ -64,7 +64,7 @@ class Cash
 	    			$update['tdate'] = time();
 	    		} elseif ($status == 2 && $amount && $amount > 0 && $info['ycash'] != $amount) {
 	    			# 待入账 可以修改金额
-		        	$this->getCash($amount, $merchant, $update);
+		        	$this->getCash($amount, $merchant, $update, $fenzhang);
 		        }
 	    		$state = Dever::db('pay/yspay_cash')->update($update);
 	    		if ($state) {