Merge remote-tracking branch 'upstream/master'

This commit is contained in:
kriss 2018-03-06 11:13:52 +08:00
commit d242e38c63

View File

@ -100,7 +100,7 @@ class Support
{
$payload = array_merge($payload, is_array($order) ? $order : ['out_trade_no' => $order]);
$type = isset($order['type']) ? ($order['type'].($order['type'] == 'app' ?: '_').'id') : 'app_id';
$type = isset($order['type']) ? $order['type'].($order['type'] == 'app' ? '' : '_').'id' : 'app_id';
$payload['appid'] = $config->get($type, '');
$mode = $config->get('mode', Wechat::MODE_NORMAL);