rabin 1 rok temu
rodzic
commit
fff499d478
1 zmienionych plików z 15 dodań i 9 usunięć
  1. 15 9
      yspay/Merchant.php

+ 15 - 9
yspay/Merchant.php

@@ -63,17 +63,23 @@ class Merchant
         $yspay = Dever::db('pay/yspay')->find(array('account_id' => $account_id));
         if ($cash && $cash > 0 && $yspay && $yspay['type'] == 2) {
             # 分账拆单
-            $project = Dever::db('pay/yspay_project')->find(array('table' => $table));
-            if ($project) {
-                $merchant = Dever::db('pay/yspay_merchant')->find(array('account_id' => $account_id, 'project_id' => $project['id'], 'relate_id' => $relate_id));
-                if ($merchant && $merchant['mid']) {
-                    $result = array(
-                        'mid' => $merchant['mid'],
-                        'order_id' => $order_num,
-                        'amount' => $cash,
-                    );
+            $merchant = array();
+            if ($table == 2) {
+                $merchant = Dever::db('pay/yspay_merchant')->find(array('account_id' => $account_id, 'type' => 2));
+            } else {
+                $project = Dever::db('pay/yspay_project')->find(array('table' => $table));
+                if ($project) {
+                    $merchant = Dever::db('pay/yspay_merchant')->find(array('account_id' => $account_id, 'project_id' => $project['id'], 'relate_id' => $relate_id));
                 }
             }
+            if ($merchant && $merchant['mid']) {
+                $result = array(
+                    'mid' => $merchant['mid'],
+                    'order_id' => $order_num,
+                    'amount' => $cash,
+                );
+            }
+            
         }
         return $result;
     }