Pārlūkot izejas kodu

fix wsd bridge add order to syste

stanley-king 4 gadi atpakaļ
vecāks
revīzija
7b6f7f358d
4 mainītis faili ar 10 papildinājumiem un 3 dzēšanām
  1. 6 1
      helper/rbridge/wsd/Bridge.php
  2. 1 0
      test/TestAddData.php
  3. 2 1
      test/TestRBridge.php
  4. 1 1
      wsd_bridge.php

+ 6 - 1
helper/rbridge/wsd/Bridge.php

@@ -38,7 +38,11 @@ class Bridge implements IBridge
         Model('merchant_query')->add_info(config::MCHID, $params['chargeId'], json_encode($params));
         $mchinfo = Model('merchant')->getMerchantInfo(['mchid' => $mchid]);
         $userid = intval($mchinfo['admin_id']);
-        [$code, $msg] = RefillFactory::instance()->add($mchid, $userid, $params['chargeCash'], $params['chargeAcct'], $params['chargeId'], config::MCH_NOTIFY_URL);
+
+        $idcard = '';
+        $card_name = '';
+
+        [$code, $msg] = RefillFactory::instance()->add($mchid, $userid, $params['chargeCash'], $params['chargeAcct'], $params['chargeId'], $idcard, $card_name,config::MCH_NOTIFY_URL);
 
         $ret = $this->retbody($code, $msg, $params);
         return json_encode($ret,JSON_UNESCAPED_UNICODE);
@@ -128,6 +132,7 @@ class Bridge implements IBridge
             if (socket_connect($sock, config::BridgeIP, config::BridgePort)) {
                 socket_write($sock, $body);
                 $resp = socket_read($sock, 1024);
+                socket_close($sock);
 
                 $resp = strtolower(trim($resp));
                 return $resp == "ok";

+ 1 - 0
test/TestAddData.php

@@ -389,5 +389,6 @@ class TestAddData extends TestCase
 //docker-compose -f ./docker-compose-dev.yml run phpcli php /var/www/html/phpunit-9.2.5.phar --filter "/(TestAddData::testCancelOrder)( .*)?$/" --test-suffix TestAddData.php /var/www/html/test
 //docker-compose -f ./docker-compose-dev.yml run phpcli php /var/www/html/phpunit-9.2.5.phar --filter "/(TestAddData::test20200821_addCard)( .*)?$/" --test-suffix TestAddData.php /var/www/html/test
 //docker-compose run phpcli php /var/www/html/phpunit-9.2.5.phar --filter "/(TestAddData::testAddCard)( .*)?$/" --test-suffix TestAddData.php /var/www/html/test
+
 //docker-compose run phpcli php /var/www/html/phpunit-9.2.5.phar --filter "/(TestAddData::testModifyCardno)( .*)?$/" --test-suffix TestAddData.php /var/www/html/test
 

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 2 - 1
test/TestRBridge.php


+ 1 - 1
wsd_bridge.php

@@ -75,7 +75,7 @@ class WSDBridge
                 socket_close($client);
             }
         }
-        
+
         socket_close($fd);
     }