rabin 1 rok pred
rodič
commit
ec6327d3fa
2 zmenil súbory, kde vykonal 10 pridanie a 14 odobranie
  1. 6 6
      yspay/Cron.php
  2. 4 8
      yspay/Multi.php

+ 6 - 6
yspay/Cron.php

@@ -20,12 +20,12 @@ class Cron
         }
         foreach ($merchant as $k => $v) {
             if ($v['mid']) {
-                $data = Dever::load('pay/yspay/account')->query($v['mid']);
-                if ($test == 1) {
-                	$config = Dever::db('pay/yspay')->one(array('account_id' => $v['account_id']));
-                	$t = Dever::load('pay/yspay/multi')->yue($config, $v);
-                    print_r($data);die;
-                }
+            	$config = Dever::db('pay/yspay')->one(array('account_id' => $v['account_id']));
+            	if ($config['type'] == 2) {
+            		$data = Dever::load('pay/yspay/multi')->yue($config, $v);
+            	} else {
+            		$data = Dever::load('pay/yspay/account')->query($v['mid']);
+            	}
                 $update['where_id'] = $v['id'];
                 $update['yue'] = $data;
                 Dever::db('pay/yspay_merchant')->update($update);

+ 4 - 8
yspay/Multi.php

@@ -103,15 +103,11 @@ class Multi
             'merNo' => $merchant['merno'],
         ];
         Dever::log($content, 'yspay_yue');
-        $result = $this->curl('202006', $content);
-        if ($result == 'ok') {
-            $data['status'] = 1;
-        } else {
-            $data['status'] = 3;
-            $data['error'] = $result; 
+        $result = $this->curl('202006', $content, false);
+        if (isset($result['canPayAmt'])) {
+            return $result['canPayAmt'];
         }
-
-        return $result;
+        return 0;
     }
 
     protected function getOrderNum($order_num)