微信开放平台的修改

app/www/controllers/WxOpenController.php

@@ -6,7 +6,7 @@ use biz\ad\classes\AdClass;
 use biz\goods\classes\CategoryClass;
 use biz\merchant\classes\MerchantExtendClass;
 use biz\merchant\services\MerchantService;
-use biz\weixin\classes\WxAccountClass;
+use biz\weixin\classes\WxBaseClass;
 use biz\weixin\services\WxOpenService;
 use common\services\xhMerchantExtendService;
 use Yii;
@@ -160,9 +160,9 @@ class WxOpenController extends PublicController
 		$appData['wxUserName'] = $user_name;
 		$appData['wxAliasName'] = $alias;
 		//公众号logo
-		$upData['logo'] = WxAccountClass::saveLogo($head_img,$id);
+		$upData['logo'] = WxBaseClass::saveLogo($head_img,$id);
 		//公众号二维码
-		$upData['wxQrCodeUrl'] = WxAccountClass::saveQrCode($qrCodeUrl,$id);
+		$upData['wxQrCodeUrl'] = WxBaseClass::saveQrCode($qrCodeUrl,$id);
 		$upData['wxAppId'] = $authorizeAppId;
 		$upData['wxAccessToken'] = $authorize_access_token;
 		$upData['wxAccessTokenTime'] = $accessTokenTime;

biz/weixin/classes/WxAccountClass.php → biz/weixin/classes/WxBaseClass.php

@@ -8,10 +8,10 @@ use biz\base\classes\BaseClass;
 use yii\imagine\Image;
 use linslin\yii2\curl;
 
-class WxAccountClass extends BaseClass
+class WxBaseClass extends BaseClass
 {
 	
-	public static $baseFile = '\biz\weixin\models\WxAccount';
+	public static $baseFile = '\biz\weixin\models\WxBase';
 	
 	//保存Logo shish 2020.3.11
 	public static function saveLogo($url, $merchantId)

biz/weixin/models/WxAccount.php → biz/weixin/models/WxBase.php

@@ -2,12 +2,12 @@
 namespace biz\weixin\models;
 use biz\base\models\Base;
 
-class WxAccount extends Base
+class WxBase extends Base
 {
 
 	public static function tableName()
 	{
-		return 'xhWxAccount';
+		return 'xhWxBase';
 	}
 
 }

biz/weixin/services/WxAccountService.php → biz/weixin/services/WxBaseService.php

@@ -9,9 +9,9 @@ use common\components\httpUtil;
 use common\components\tree;
 use Yii;
 
-class WxAccountService extends BaseService
+class WxBaseService extends BaseService
 {
 
-	public static $baseFile = '\biz\weixin\classes\WxAccountClass';
+	public static $baseFile = '\biz\weixin\classes\WxBaseClass';
 
 }

console/controllers/UpgradeController.php

@@ -20,7 +20,7 @@ use biz\user\services\UserAssetService;
 use biz\user\services\UserCapitalService;
 use biz\user\services\UserGrowthService;
 use biz\user\services\UserService;
-use biz\weixin\classes\WxAccountClass;
+use biz\weixin\classes\WxBaseClass;
 use biz\weixin\services\WxMenuService;
 use common\components\dirUtil;
 use common\components\util;
@@ -1291,8 +1291,44 @@ distance DECIMAL(6,1) NOT NULL DEFAULT 0.0 COMMENT '距离',
 
 		$sql = "ALTER TABLE `xhMerchant` ADD `platform` TINYINT NOT NULL DEFAULT 0 COMMENT '0普遍商家1平台使用的商家' AFTER `deadline`;";
 		Yii::$app->db->createCommand($sql)->execute($sql);
+
+		$sql = "RENAME TABLE `xhWxAccount` TO `xhWxBase`;";
+		Yii::$app->db->createCommand($sql)->execute($sql);
+		
+		$sql = "ALTER TABLE `xhAdmin` ADD `openId` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '微信openid' AFTER `remind`;
+ALTER TABLE `xhAdmin` ADD `miniOpenId` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '小程序openid' AFTER `remind`;
+ALTER TABLE `xhAdmin` ADD `unionId` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '微信平台唯一id' AFTER `remind`;
+ALTER TABLE `xhAdmin` ADD `subscribe` TINYINT NOT NULL DEFAULT 0 COMMENT '关注平台 0未关注 1关注' AFTER `remind`;
+ALTER TABLE `xhAdmin` ADD `hasSubscribe` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '是否关注过 0没有 1是的' AFTER `remind`;
+ALTER TABLE `xhAdmin` ADD `subscribeTime` INT(11) NOT NULL DEFAULT '0' COMMENT '关注时间' AFTER `remind`;
+DROP TABLE IF EXISTS `xhWxBase`;
+CREATE TABLE IF NOT EXISTS `xhWxBase`(
+  `id` INT(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  `name` VARCHAR(50) NOT NULL DEFAULT '' COMMENT '公众号名称',
+  `logo` VARCHAR(500) NOT NULL DEFAULT '' COMMENT '公众号logo',
+  `merchantId` INT(11) NOT NULL DEFAULT '0' COMMENT '商家id 0平台使用商家',
+  `miniAppId` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '小程序appid',
+  `miniAppSecret` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '小程序appSecret',
+  `wxAppId` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '公众号appid',
+  `wxAppSecret` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '公众号appsecret',
+  `openAppId` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '开放平台帐号',
+  `wxUserName` VARCHAR(50) NOT NULL DEFAULT '' COMMENT '微信原始名 gh_083d437a9941',
+  `wxAliasName` VARCHAR(50) NOT NULL DEFAULT '' COMMENT '微信别名 hzgdzh',
+  `wxQrCodeUrl` VARCHAR(500) NOT NULL DEFAULT '' COMMENT '公众号二维码',
+  `wxToken` VARCHAR(500) NOT NULL DEFAULT '' COMMENT 'token',
+  `wxJsApiTicket` VARCHAR(500) NOT NULL DEFAULT '' COMMENT '微信分享jsapi_ticket',
+  `wxJsApiTicketExpire` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00' COMMENT '微信分享jsapi_ticket过期时间点',
+  `wxAccessToken` VARCHAR(500) NOT NULL DEFAULT '' COMMENT 'wxAccessToken',
+  `wxAccessTokenTime` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00' COMMENT 'accesstoken过期时间',
+  `wxRefreshToken` VARCHAR(500) NOT NULL DEFAULT '' COMMENT 'wxAccessToken refresh token',
+  `addTime` INT(11) NOT NULL DEFAULT '0' COMMENT '添加时间'
+)COMMENT='公众号基础信息';
+ALTER TABLE `xhMerchant` DROP COLUMN `platform`;
+ALTER TABLE `xhWxOpen` ADD wx_base_id INT NOT NULL DEFAULT 0 COMMENT '平台对应的公众号' AFTER `merchantId`;";
+		Yii::$app->db->createCommand($sql)->execute($sql);
+
 	}
-	
+
 	//数据迁移 shish 2020.1.12
 	//./yii upgrade/sync
 	public function actionSync()
@@ -1429,12 +1465,12 @@ distance DECIMAL(6,1) NOT NULL DEFAULT 0.0 COMMENT '距离',
 		$update = [];
 		if (isset($respond['authorizer_info']['head_img']) && !empty($respond['authorizer_info']['head_img'])) {
 			$imgUrl = $respond['authorizer_info']['head_img'];
-			$returnImg = WxAccountClass::saveLogo($imgUrl, $id);
+			$returnImg = WxBaseClass::saveLogo($imgUrl, $id);
 			$update['logo'] = $returnImg;
 		}
 		if (isset($respond['authorizer_info']['qrcode_url']) && !empty($respond['authorizer_info']['qrcode_url'])) {
 			$qrCodeUrl = $respond['authorizer_info']['qrcode_url'];
-			$returnImg = WxAccountClass::saveQrCode($qrCodeUrl, $id);
+			$returnImg = WxBaseClass::saveQrCode($qrCodeUrl, $id);
 			$update['wxQrCodeUrl'] = $returnImg;
 		}
 		if (!empty($update)) {