授权

app/saas/controllers/WxOpenController.php

@@ -27,11 +27,11 @@ class WxOpenController extends BaseController
 
     public function actionBindOpen()
     {
+        $merchantId = Yii::$app->request->get('merchantId', 0);
         $isOpen = Yii::$app->request->get('isOpen', 0);
         if ($isOpen == 1) {
             $merchant = WxOpenService::getWxInfo();
         } else {
-            $merchantId = Yii::$app->request->get('merchantId', 0);
             $merchant = MerchantService::getMerchantById($merchantId);
             if (empty($merchant)) {
                 util::fail('没有找到商家');
@@ -52,15 +52,29 @@ class WxOpenController extends BaseController
             print_r($return);
             if ($return['errcode'] == 0) {
                 $openAppId = $return['open_appid'];
-                MerchantService::updateById($merchantId, ['openAppId' => $openAppId]);
-                MerchantExtendService::updateByCondition(['merchantId' => $merchantId], ['openAppId' => $openAppId, 'openAppBind' => 1, 'wxAuth' => 1]);
+
+                if ($isOpen == 1) {
+                    WxOpenService::updateOpen(['appIdCreated' => $openAppId, 'openAppBind' => 1]);
+                } else {
+                    MerchantService::updateById($merchantId, ['openAppId' => $openAppId]);
+                    MerchantExtendService::updateByCondition(['merchantId' => $merchantId], ['openAppId' => $openAppId, 'openAppBind' => 1, 'wxAuth' => 1]);
+                }
+
+
             }
         }
         //将小程序绑定到平台
         if ($id == 2) {
             $openAppId = $merchant['openAppId'];
             $r = wxUtil::bindOpenAccount($miniAppId, $openAppId, $merchant, true);
-            MerchantExtendService::updateByCondition(['merchantId' => $merchantId], ['openAppBind' => 3, 'miniAuth' => 1]);
+
+            if ($isOpen == 1) {
+                WxOpenService::updateOpen(['appIdCreated' => $openAppId, 'openAppBind' => 3]);
+            } else {
+                MerchantExtendService::updateByCondition(['merchantId' => $merchantId], ['openAppBind' => 3, 'miniAuth' => 1]);
+            }
+
+
             print_r($r);
         }
         //查询公众号 小程序的绑定情况

biz/weixin/services/WxOpenService.php

@@ -49,9 +49,11 @@ class WxOpenService extends BaseService
     //获取微信和小程序信息 shish 2020.4.14
     public static function getWxInfo()
     {
+        $open = WxOpenClass::getOpen();
+        $openAppId = isset($open['appIdCreated']) ? $open['appIdCreated'] : '';
         $mini = WxOpenClass::getWxMiniBase();
         $wx = WxOpenClass::getWxBase();
-        return array_merge($wx, $mini);
+        return array_merge($wx, $mini, ['openAppId' => $openAppId]);
     }
 
 }

console/controllers/UpgradeController.php

@@ -1365,12 +1365,15 @@ ALTER TABLE `xhAdmin` DROP COLUMN `currentShopId`;";
         Yii::$app->db->createCommand($sql)->execute($sql);
 
         //修改总后台员工登陆密码
-        StaffService::updateById(1,['password'=>password_hash('123456', PASSWORD_BCRYPT)]);
+        StaffService::updateById(1, ['password' => password_hash('123456', PASSWORD_BCRYPT)]);
 
-	    $sql = "ALTER TABLE `xhAdminRelate` ADD `adminId` INT NOT NULL DEFAULT 0 COMMENT '管理员id' AFTER `id`;";
-	    Yii::$app->db->createCommand($sql)->execute($sql);
+        $sql = "ALTER TABLE `xhAdminRelate` ADD `adminId` INT NOT NULL DEFAULT 0 COMMENT '管理员id' AFTER `id`;";
+        Yii::$app->db->createCommand($sql)->execute($sql);
+
+        $sql = "ALTER TABLE `xhWxMiniBase` ADD `miniAppSecret` VARCHAR(100) NOT NULL DEFAULT '' COMMENT 'appSecret' AFTER `miniAppId`;";
+        Yii::$app->db->createCommand($sql)->execute($sql);
 
-	    $sql = "ALTER TABLE `xhWxMiniBase` ADD `miniAppSecret` VARCHAR(100) NOT NULL DEFAULT '' COMMENT 'appSecret' AFTER `miniAppId`;";
+        $sql = "ALTER TABLE `xhWxOpen` ADD `openAppBind` TINYINT NOT NULL DEFAULT 0 COMMENT '绑定平台状况 0没有创建 1公众号已绑 2小程序已绑 3公众号和小程序都已绑' AFTER `appIdCreated`;";
         Yii::$app->db->createCommand($sql)->execute($sql);
 
     }
@@ -1533,7 +1536,7 @@ ALTER TABLE `xhAdmin` DROP COLUMN `currentShopId`;";
     public function actionBc()
     {
         //修改总后台员工登陆密码
-        StaffService::updateById(1,['password'=>password_hash('123456', PASSWORD_BCRYPT)]);
+        StaffService::updateById(1, ['password' => password_hash('123456', PASSWORD_BCRYPT)]);
     }
 
 }