shish 6 лет назад
Родитель
Сommit
994ab3c7dc
1 измененных файлов с 7 добавлено и 3 удалено
  1. 7 3
      app/www/controllers/WxOpenController.php

+ 7 - 3
app/www/controllers/WxOpenController.php

@@ -108,11 +108,15 @@ 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('公众号不是服务号');
+			if (isset($authorize_info['MiniProgramInfo']) == false || empty($authorize_info['MiniProgramInfo'])) {
+				util::stop('公众号不是服务号');
+			}
 		}
 		$verify_type_info = $authorize_info['verify_type_info'];
 		if ($verify_type_info['id'] != 0) {
-			util::stop('公众号还没有认证哦');
+			if (isset($authorize_info['MiniProgramInfo']) == false || empty($authorize_info['MiniProgramInfo'])) {
+				util::stop('公众号还没有认证哦');
+			}
 		}
 		$user_name = $authorize_info['user_name'];
 		$alias = $authorize_info['alias'];
@@ -149,7 +153,7 @@ class WxOpenController extends PublicController
 		$upData['status'] = 1;//审核通过
 		xhMerchantService::updateById($id, $upData);
 		MerchantExtendClass::updateByCondition(['merchantId' => $id], ['wxAppId' => $authorizeAppId]);
-
+		
 		//还没有完成初始化先进行初始化
 		$extend = MerchantExtendClass::getByMerchantId($id);
 		if (isset($extend['init']) && $extend['init'] == 0) {