|
@@ -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";
|