|
|
@@ -293,9 +293,8 @@ class WxOpenController extends BaseController
|
|
|
WxOpenService::updateOpen(['wx_mini_base_id' => $wxMiniBaseId]);
|
|
|
util::stop('开放平台成功绑定小程序');
|
|
|
}
|
|
|
- }
|
|
|
|
|
|
- if (isset($authorize_info['MiniProgramInfo']) && !empty($authorize_info['MiniProgramInfo'])) {
|
|
|
+
|
|
|
if (isset($extend['miniAppId']) && !empty($extend['miniAppId'])) {
|
|
|
if ($extend['miniAppId'] != $authorizeAppId) {
|
|
|
util::stop('授权的小程序与商家已绑定的小程序不一致');
|
|
|
@@ -303,6 +302,12 @@ class WxOpenController extends BaseController
|
|
|
} else {
|
|
|
util::stop('数据库请先填写小程序 miniAppId miniAppSecret');
|
|
|
}
|
|
|
+
|
|
|
+ xhMerchantExtendService::updateByMerchantId($id, $miniData);
|
|
|
+ MerchantService::updateById($id, ['miniAppId' => $authorizeAppId]);
|
|
|
+ Yii::info('小程序信息更新成功:' . json_encode($authorize_info));
|
|
|
+ util::stop("小程序信息更新成功");
|
|
|
+
|
|
|
} else {
|
|
|
if (isset($extend['wxAppId']) && !empty($extend['wxAppId'])) {
|
|
|
if ($extend['wxAppId'] != $authorizeAppId) {
|
|
|
@@ -311,18 +316,6 @@ class WxOpenController extends BaseController
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-
|
|
|
- //小程序
|
|
|
- if (isset($authorize_info['MiniProgramInfo']) && !empty($authorize_info['MiniProgramInfo'])) {
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
- xhMerchantExtendService::updateByMerchantId($id, $miniData);
|
|
|
- MerchantService::updateById($id, ['miniAppId' => $authorizeAppId]);
|
|
|
- Yii::info('小程序信息更新成功:' . json_encode($authorize_info));
|
|
|
- util::stop("小程序信息更新成功");
|
|
|
- }
|
|
|
-
|
|
|
$wxData = [];
|
|
|
$appData['wxUserName'] = $user_name;
|
|
|
$appData['wxAliasName'] = $alias;
|