|
|
@@ -32,10 +32,12 @@ class WxOpenController extends PublicController
|
|
|
$pre = weixinOpenUtil::getPreAuthCode($open);
|
|
|
$appId = $open['appId'];
|
|
|
$oData = [];
|
|
|
- $oData['preAuthCodeTime'] = date("Y-m-d H:i:s");//设置预授码过期，让下个用户可以获取新的预授码
|
|
|
+ $oData['preAuthCodeTime'] = date("Y-m-d H:i:s");
|
|
|
+ //设置预授码过期，让下个用户可以获取新的预授码
|
|
|
xhWxOpenService::updateById($id, $oData);
|
|
|
$url = Yii::$app->params['w'] . '/wx-open/callback';
|
|
|
- $merchantId = $open['merchantId'];//如果平台没有绑定商家，先去创建第一个商家
|
|
|
+ $merchantId = $open['merchantId'];
|
|
|
+ //如果平台没有对应的商家，先去创建第一个商家并做关联
|
|
|
if (empty($merchantId)) {
|
|
|
$url = Yii::$app->params['w'] . '/wx-open/callback-create-first-merchant';
|
|
|
}
|
|
|
@@ -111,7 +113,7 @@ class WxOpenController extends PublicController
|
|
|
$merchant = xhMerchantService::getByAppId($authorizeAppId);
|
|
|
$wxAccessTokenTime = date("Y-m-d H:i:s", (time() + $expires_in - 100));//安全起见，将过期时间设置得比微信里还短100秒
|
|
|
if (!empty($merchant)) {
|
|
|
- util::stop('平台已经关联公众号了');
|
|
|
+ util::stop('此公众号已经授权过了');
|
|
|
}
|
|
|
//引导生成商家
|
|
|
$date = date("Y-m-d H:i:s");
|
|
|
@@ -194,7 +196,7 @@ class WxOpenController extends PublicController
|
|
|
$head_img = $authorize_info['head_img'];
|
|
|
$service_type_info = $authorize_info['service_type_info'];
|
|
|
if ($service_type_info['id'] != 2) {
|
|
|
- util::stop('公众号不是服务号,appId:'.$authorizeAppId.' refresh:'.$authorize_refresh_token);
|
|
|
+ util::stop('公众号不是服务号,appId:' . $authorizeAppId . ' refresh:' . $authorize_refresh_token);
|
|
|
}
|
|
|
$verify_type_info = $authorize_info['verify_type_info'];
|
|
|
if ($verify_type_info['id'] != 0) {
|
shish