shish před 6 roky
rodič
revize
b02aeff0e8
1 změnil soubory, kde provedl 4 přidání a 3 odebrání
  1. 4 3
      app/www/controllers/WxOpenController.php

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

@@ -128,7 +128,7 @@ class WxOpenController extends PublicController
 		if (isset($open['merchantId']) && empty($open['merchantId'])) {
 		if (isset($open['merchantId']) && empty($open['merchantId'])) {
 			WxOpenService::updateById(1, ['merchantId' => $id]);
 			WxOpenService::updateById(1, ['merchantId' => $id]);
 		}
 		}
-
+		
 		$merchant = MerchantService::getMerchantById($id);
 		$merchant = MerchantService::getMerchantById($id);
 		if (isset($merchant['wxAppId']) && !empty($merchant['wxAppId'])) {
 		if (isset($merchant['wxAppId']) && !empty($merchant['wxAppId'])) {
 			if (isset($authorize_info['MiniProgramInfo']) == false || empty($authorize_info['MiniProgramInfo'])) {
 			if (isset($authorize_info['MiniProgramInfo']) == false || empty($authorize_info['MiniProgramInfo'])) {
@@ -137,7 +137,7 @@ class WxOpenController extends PublicController
 				}
 				}
 			}
 			}
 		}
 		}
-
+		
 		if (isset($merchant['miniAppId']) && !empty($merchant['miniAppId'])) {
 		if (isset($merchant['miniAppId']) && !empty($merchant['miniAppId'])) {
 			if (isset($authorize_info['MiniProgramInfo']) && !empty($authorize_info['MiniProgramInfo'])) {
 			if (isset($authorize_info['MiniProgramInfo']) && !empty($authorize_info['MiniProgramInfo'])) {
 				if ($merchant['miniAppId'] != $authorizeAppId) {
 				if ($merchant['miniAppId'] != $authorizeAppId) {
@@ -145,10 +145,11 @@ class WxOpenController extends PublicController
 				}
 				}
 			}
 			}
 		}
 		}
-
+		
 		//小程序
 		//小程序
 		if (isset($authorize_info['MiniProgramInfo']) && !empty($authorize_info['MiniProgramInfo'])) {
 		if (isset($authorize_info['MiniProgramInfo']) && !empty($authorize_info['MiniProgramInfo'])) {
 			xhMerchantExtendService::updateByMerchantId($id, ['miniAppId' => $authorizeAppId, 'miniAccessToken' => $authorize_access_token, 'miniAccessTokenTime' => $accessTokenTime, 'miniRefreshToken' => $authorize_refresh_token]);
 			xhMerchantExtendService::updateByMerchantId($id, ['miniAppId' => $authorizeAppId, 'miniAccessToken' => $authorize_access_token, 'miniAccessTokenTime' => $accessTokenTime, 'miniRefreshToken' => $authorize_refresh_token]);
+			MerchantService::updateById($id, ['miniAppId' => $authorizeAppId]);
 			Yii::info('小程序信息更新成功:' . json_encode($authorize_info));
 			Yii::info('小程序信息更新成功:' . json_encode($authorize_info));
 			util::stop("小程序信息更新成功");
 			util::stop("小程序信息更新成功");
 		}
 		}