diff --git a/extend/service/WechatService.php b/extend/service/WechatService.php index b189e80f6..d9c0b511f 100644 --- a/extend/service/WechatService.php +++ b/extend/service/WechatService.php @@ -65,7 +65,7 @@ use think\Exception; * @method \WePay\Coupon WePayCoupon() static 微信商户代金券 * @method \WePay\Redpack WePayRedpack() static 微信红包支持 * @method \WePay\Transfers WePayTransfers() static 微信商户打款到零钱 - * @method \WePay\TransfersBank WePayTransFresBank() static 微信商户打款到银行卡 + * @method \WePay\TransfersBank WePayTransfersBank() static 微信商户打款到银行卡 * * ----- WeOpen ----- * @method \WeOpen\Login login() static 第三方微信登录 diff --git a/vendor/autoload.php b/vendor/autoload.php index d042b0ae4..9fd44d844 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit17615e58750b74642eba8e90fe699c26::getLoader(); +return ComposerAutoloaderInit4fa8eddf7e9cd8fde7f5828e9f4f1501::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 8b240e0fd..1c1e45ba2 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit17615e58750b74642eba8e90fe699c26 +class ComposerAutoloaderInit4fa8eddf7e9cd8fde7f5828e9f4f1501 { private static $loader; @@ -19,15 +19,15 @@ class ComposerAutoloaderInit17615e58750b74642eba8e90fe699c26 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit17615e58750b74642eba8e90fe699c26', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit4fa8eddf7e9cd8fde7f5828e9f4f1501', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInit17615e58750b74642eba8e90fe699c26', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit4fa8eddf7e9cd8fde7f5828e9f4f1501', 'loadClassLoader')); $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded()); if ($useStaticLoader) { require_once __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit17615e58750b74642eba8e90fe699c26::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit4fa8eddf7e9cd8fde7f5828e9f4f1501::getInitializer($loader)); } else { $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { @@ -48,19 +48,19 @@ class ComposerAutoloaderInit17615e58750b74642eba8e90fe699c26 $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInit17615e58750b74642eba8e90fe699c26::$files; + $includeFiles = Composer\Autoload\ComposerStaticInit4fa8eddf7e9cd8fde7f5828e9f4f1501::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequire17615e58750b74642eba8e90fe699c26($fileIdentifier, $file); + composerRequire4fa8eddf7e9cd8fde7f5828e9f4f1501($fileIdentifier, $file); } return $loader; } } -function composerRequire17615e58750b74642eba8e90fe699c26($fileIdentifier, $file) +function composerRequire4fa8eddf7e9cd8fde7f5828e9f4f1501($fileIdentifier, $file) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { require $file; diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 3b193fce0..753ca9cb1 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit17615e58750b74642eba8e90fe699c26 +class ComposerStaticInit4fa8eddf7e9cd8fde7f5828e9f4f1501 { public static $files = array ( '1cfd2761b63b0a29ed23657ea394cb2d' => __DIR__ . '/..' . '/topthink/think-captcha/src/helper.php', @@ -302,9 +302,9 @@ class ComposerStaticInit17615e58750b74642eba8e90fe699c26 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit17615e58750b74642eba8e90fe699c26::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit17615e58750b74642eba8e90fe699c26::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit17615e58750b74642eba8e90fe699c26::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit4fa8eddf7e9cd8fde7f5828e9f4f1501::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit4fa8eddf7e9cd8fde7f5828e9f4f1501::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit4fa8eddf7e9cd8fde7f5828e9f4f1501::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 773a7f262..2dd8b179d 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -80,17 +80,17 @@ }, { "name": "zoujingli/wechat-developer", - "version": "v1.1.9", - "version_normalized": "1.1.9.0", + "version": "v1.1.10", + "version_normalized": "1.1.10.0", "source": { "type": "git", "url": "https://github.com/zoujingli/WeChatDeveloper.git", - "reference": "12052df1505dfb3a6c95ab8892a6c228ae3a366a" + "reference": "fd179277a64b5435140617ef2fa3a2420d55795e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/12052df1505dfb3a6c95ab8892a6c228ae3a366a", - "reference": "12052df1505dfb3a6c95ab8892a6c228ae3a366a", + "url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/fd179277a64b5435140617ef2fa3a2420d55795e", + "reference": "fd179277a64b5435140617ef2fa3a2420d55795e", "shasum": "" }, "require": { @@ -98,7 +98,7 @@ "ext-openssl": "*", "php": ">=5.4" }, - "time": "2018-05-25T08:14:33+00:00", + "time": "2018-05-27T14:38:28+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -278,8 +278,8 @@ }, { "name": "symfony/options-resolver", - "version": "v3.4.10", - "version_normalized": "3.4.10.0", + "version": "v3.4.11", + "version_normalized": "3.4.11.0", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", diff --git a/vendor/zoujingli/wechat-developer/We.php b/vendor/zoujingli/wechat-developer/We.php index f7e23ff16..9ecd8df36 100644 --- a/vendor/zoujingli/wechat-developer/We.php +++ b/vendor/zoujingli/wechat-developer/We.php @@ -57,13 +57,13 @@ use WeChat\Exceptions\InvalidInstanceException; * @method \WePay\Coupon WePayCoupon($options = []) static 微信商户代金券 * @method \WePay\Redpack WePayRedpack($options = []) static 微信红包支持 * @method \WePay\Transfers WePayTransfers($options = []) static 微信商户打款到零钱 - * @method \WePay\TransfersBank WePayTransFresBank($options = []) static 微信商户打款到银行卡 + * @method \WePay\TransfersBank WePayTransfersBank($options = []) static 微信商户打款到银行卡 */ class We { /** * 静态配置 - * @var array + * @var DataArray */ private static $config; diff --git a/vendor/zoujingli/wechat-developer/WePay/Redpack.php b/vendor/zoujingli/wechat-developer/WePay/Redpack.php index 8456810a4..4da89758d 100644 --- a/vendor/zoujingli/wechat-developer/WePay/Redpack.php +++ b/vendor/zoujingli/wechat-developer/WePay/Redpack.php @@ -35,7 +35,7 @@ class Redpack extends BasicPay $this->params->offsetUnset('appid'); $this->params->set('wxappid', $this->config->get('appid')); $url = "https://api.mch.weixin.qq.com/mmpaymkttransfers/sendredpack"; - return $this->callPostApi($url, $options, true); + return $this->callPostApi($url, $options, true, 'MD5', false); } /** @@ -49,21 +49,21 @@ class Redpack extends BasicPay $this->params->offsetUnset('appid'); $this->params->set('wxappid', $this->config->get('appid')); $url = "https://api.mch.weixin.qq.com/mmpaymkttransfers/sendgroupredpack"; - return $this->callPostApi($url, $options, true); + return $this->callPostApi($url, $options, true, 'MD5', false); } /** * 查询红包记录 - * @param array $options + * @param string $mchBillno 商户发放红包的商户订单号 * @return array * @throws \WeChat\Exceptions\InvalidResponseException */ - public function query(array $options) + public function query($mchBillno) { $this->params->offsetUnset('wxappid'); $this->params->set('appid', $this->config->get('appid')); $url = "https://api.mch.weixin.qq.com/mmpaymkttransfers/gethbinfo"; - return $this->callPostApi($url, $options, true); + return $this->callPostApi($url, ['mch_billno' => $mchBillno, 'bill_type' => 'MCHT'], true, 'MD5', false); } } \ No newline at end of file diff --git a/vendor/zoujingli/wechat-developer/WePay/Transfers.php b/vendor/zoujingli/wechat-developer/WePay/Transfers.php index 410aa8b75..f86d147fa 100644 --- a/vendor/zoujingli/wechat-developer/WePay/Transfers.php +++ b/vendor/zoujingli/wechat-developer/WePay/Transfers.php @@ -32,10 +32,10 @@ class Transfers extends BasicPay */ public function create(array $options) { - $this->params->set('mchid', $this->config->get('mch_id')); - $this->params->set('mch_appid', $this->config->get('appid')); $this->params->offsetUnset('appid'); $this->params->offsetUnset('mch_id'); + $this->params->set('mchid', $this->config->get('mch_id')); + $this->params->set('mch_appid', $this->config->get('appid')); $url = 'https://api.mch.weixin.qq.com/mmpaymkttransfers/promotion/transfers'; return $this->callPostApi($url, $options, true, 'MD5', false); } @@ -48,11 +48,11 @@ class Transfers extends BasicPay */ public function query($partnerTradeNo) { - $url = 'https://api.mch.weixin.qq.com/mmpaymkttransfers/gettransferinfo'; - $this->params->set('appid', $this->config->get('appid')); - $this->params->set('mch_id', $this->config->get('mch_id')); $this->params->offsetUnset('mchid'); $this->params->offsetUnset('mch_appid'); + $this->params->set('appid', $this->config->get('appid')); + $this->params->set('mch_id', $this->config->get('mch_id')); + $url = 'https://api.mch.weixin.qq.com/mmpaymkttransfers/gettransferinfo'; return $this->callPostApi($url, ['partner_trade_no' => $partnerTradeNo], true, 'MD5', false); }