shish 6 лет назад
Родитель
Сommit
3ff0cba3b4
2 измененных файлов с 25 добавлено и 13 удалено
  1. 10 6
      biz/merchant/services/MerchantService.php
  2. 15 7
      console/controllers/UpgradeController.php

+ 10 - 6
biz/merchant/services/MerchantService.php

@@ -132,12 +132,12 @@ class MerchantService extends BaseService
 	{
 		return MerchantClass::getMerchantById($id);
 	}
-
+	
 	public static function getCurrentSetId($id)
 	{
 		return MerchantClass::getCurrentSetId($id);
 	}
-
+	
 	//开店公众号授权之后初始化 shish 2020.2.7
 	public static function openShopInit($data)
 	{
@@ -152,7 +152,7 @@ class MerchantService extends BaseService
 		$connection = Yii::$app->db;//事务处理
 		$transaction = $connection->beginTransaction();
 		try {
-
+			
 			//商品、分类、首页幻灯片、门店图片
 			
 			//初始化微信菜单
@@ -160,8 +160,8 @@ class MerchantService extends BaseService
 			//微信客户初始化
 			$return = UserService::syncWxAllUser($merchantId);
 			$totalNum = isset($return['total']) ? $return['total'] : 0;
-			MerchantAssetClass::updateByCondition(['merchantId' => $merchantId, ['totalFans' => $totalNum, 'totalUser' => $totalNum]]);
-			
+			MerchantAssetClass::updateByCondition(['merchantId' => $merchantId], ['totalFans' => $totalNum, 'totalUser' => $totalNum]);
+
 			//创建门店
 			$shopData = ['shopName' => $merchant['merchantName'], 'merchantName' => $merchant['merchantName'], 'merchantId' => $merchantId, 'addTime' => $time, 'createTime' => $date, 'updateTime' => $date];
 			$shopReturn = ShopClass::addShop($shopData);
@@ -188,9 +188,13 @@ class MerchantService extends BaseService
 				];
 				AdminClass::addAdmin($adminData);
 			}
+
+			//模板消息
+			xhWxMenuService::applyInit($merchant);
+
 		} catch (Exception $e) {
 			$transaction->rollBack();
 		}
 	}
-
+	
 }

+ 15 - 7
console/controllers/UpgradeController.php

@@ -33,7 +33,7 @@ class UpgradeController extends Controller
 		if (getenv('YII_ENV') == 'dev') {
 			util::stop('开发环境不允许再初始化');
 		}
-
+		
 		//更新积分 shish 2019.11.22
 		$sql = "ALTER TABLE xhUserAsset ADD growth INT NOT NULL DEFAULT 0 COMMENT '成长值' AFTER `point`;";
 		$sql .= "UPDATE `xhUserAsset` SET `growth`=`integral`;";
@@ -1041,12 +1041,12 @@ CREATE TABLE `xhStatViewMonth` (
 					}
 				}
 			}
-
+			
 			//会员头像是否正确一致
 			$this->actionSyncAvatar();
-
+			
 		}
-
+		
 		$sql = "ALTER TABLE xhGoods ADD `briefContent` VARCHAR(1000) NOT NULL DEFAULT '' COMMENT '简单内容介绍,移动端添加商品' AFTER `content`;";
 		Yii::$app->db->createCommand($sql)->execute();
 		
@@ -1064,14 +1064,22 @@ CREATE TABLE `xhStatViewMonth` (
 			$sql .= "insert  into `xhWxOpen`(`id`,`appId`,`openName`,`appSecret`,`merchantId`,`adminId`,`token`,`verifyTicket`,`verifyTicketTime`,`componentAccessToken`,`componentAccessTokenTime`,`aesKey`,`preAuthCode`,`preAuthCodeTime`,`createTime`,`updateTime`) values (1,'wx364800c320a0cf53','花掌柜助手','6a83bfa98f3ff5e66b1a85a19c54ebdb',0,0,'wt11464773309','ticket@@@mUTfkCa6p-W5fIB_YvWDiSzUvsCVJNN6fELjsHnZ07Nvz5hfRMyfHzmjn3ZPK9Gi5aqY2_H7ruxnX2cdYdjRIg','2020-01-09 21:04:50','29_RQZoasQKtSPVa754Inhu3aKiAfou3KYGJT5SGtqWy74cHoL3aEfPt0xTR6JMuULyDN4-25fBDTE-VS_jtalbq6WTbb5d7B-K4dUSS3zDbKykNtctzFnBBnDzkbGRXcw2b8OS8JY_HHblIlFZTVLcAGAGIY','2020-01-09 21:36:26','Gm2BIikJaExAbiyafGoJGFbEsECb4mDEnyEYgl9WXW5','preauthcode@@@IJXez4FxmgNRLow1rmxhAxM2eaKQYY6g1ocsK8Koe4v9mx7mr07arTNZTLxe2Sf2','2019-12-19 16:13:58','2019-04-17 14:49:19','2020-01-09 12:54:50');";
 			Yii::$app->db->createCommand($sql)->execute();
 		}
-	}
 
+		//客户的省市区延长字段,有外国英文名称的比较长
+		$sql = "ALTER TABLE `xhUser` MODIFY `province` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '省';
+ALTER TABLE `xhUser` MODIFY `city` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '市';
+ALTER TABLE `xhUser` MODIFY `dist` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '区';
+ALTER TABLE `xhUser` MODIFY `address` VARCHAR(500) NOT NULL DEFAULT '' COMMENT '详细地址';";
+		Yii::$app->db->createCommand($sql)->execute();
+
+	}
+	
 	//重新拉取并保存国兰客户的头像和图片 shish 2020.1.12
 	public function actionSyncAvatar()
 	{
 		UserService::syncAvatar(12358);
 	}
-
+	
 	//可以重复初始化的一些东西 shish 2020.1.21
 	public function actionRepeatInit($id)
 	{
@@ -1079,5 +1087,5 @@ CREATE TABLE `xhStatViewMonth` (
 		$merchant = xhMerchantService::getById($id);
 		xhWxMenuService::applyInit($merchant);
 	}
-
+	
 }