模板消息

biz/merchant/services/MerchantService.php

@@ -155,11 +155,6 @@ class MerchantService extends BaseService
 		$transaction = $connection->beginTransaction();
 		try {
 			
-			//模板消息
-			echo 'hhhhh';
-			xhTMessageService::init($merchant);
-
-
 			//商品、分类、首页幻灯片、门店图片
 			
 			//初始化微信菜单
@@ -196,6 +191,11 @@ class MerchantService extends BaseService
 				AdminClass::addAdmin($adminData);
 			}
 			
+			//模板消息
+			xhTMessageService::init($merchant);
+
+			$transaction->commit();
+
 		} catch (Exception $e) {
 			$transaction->rollBack();
 		}

common/models/xhTMessage.php

@@ -4,9 +4,7 @@ namespace common\models;
 
 class xhTMessage extends xhBaseModel
 {
-    /**
-     * @inheritdoc
-     */
+
     public static function tableName()
     {
         return 'xhTMessage';

common/services/xhTMessageService.php

@@ -28,7 +28,7 @@ class xhTMessageService
 		$tm = xhTMessage::add($data);
 		return $tm;
 	}
-
+	
 	public static function batchAdd($data)
 	{
 		xhTMessage::batchAdd($data);
@@ -46,41 +46,39 @@ class xhTMessageService
 		wxUtil::setTMIndustry($merchant, 1, 31);
 		$merchantId = $merchant['id'];
 		$original = configDict::getConfig('tMessage');
-		if (!empty($original)) {
-			$preTMessage = wxUtil::getAllTMessage($merchant);//删除原有的
-			if (!empty($preTMessage)) {
-				if (isset($preTMessage['template_list'])) {
-					foreach ($preTMessage['template_list'] as $key => $val) {
-						$template_id = $val['template_id'];
-						wxUtil::delTMessage($merchant, $template_id);
-					}
-				}
-			}
-			$message = self::getList($merchantId);
-			if (!empty($message)) {
-				self::delByMerchantId($merchantId);
-			}
-			$batchData = [];
-			foreach ($original as $key => $val) {//重新添加
-				$wxMessage = wxUtil::tMessageCreate($merchant, $key);
-				if (isset($wxMessage['errcode']) && $wxMessage['errcode'] == 0) {
-					$templateId = $wxMessage['template_id'];
-					$data = [
-						'shortTemplateId' => $key,
-						'templateId' => $templateId,
-						'templateName' => $val,
-						'merchantId' => $merchantId,
-						'createTime' => date("Y-m-d H:i:s"),
-					];
-					$batchData[] = $data;
+		if (empty($original)) {
+			return false;
+		}
+		$preTMessage = wxUtil::getAllTMessage($merchant);//删除原有的
+		if (!empty($preTMessage)) {
+			if (isset($preTMessage['template_list'])) {
+				foreach ($preTMessage['template_list'] as $key => $val) {
+					$template_id = $val['template_id'];
+					wxUtil::delTMessage($merchant, $template_id);
 				}
 			}
-			echo 'abc';
-			print_r($batchData);
-			if(!empty($batchData)){
-				self::batchAdd($batchData);
+		}
+		$message = self::getList($merchantId);
+		if (!empty($message)) {
+			self::delByMerchantId($merchantId);
+		}
+		$batchData = [];
+		foreach ($original as $key => $val) {//重新添加
+			$wxMessage = wxUtil::tMessageCreate($merchant, $key);
+			if (isset($wxMessage['errcode']) && $wxMessage['errcode'] == 0) {
+				$templateId = $wxMessage['template_id'];
+				$data = [
+					'shortTemplateId' => $key,
+					'templateId' => $templateId,
+					'templateName' => $val,
+					'merchantId' => $merchantId,
+					'createTime' => date("Y-m-d H:i:s"),
+				];
+				$batchData[] = $data;
 			}
-			echo 'xxxx';die;
+		}
+		if (!empty($batchData)) {
+			self::batchAdd($batchData);
 		}
 		xhMerchantExtendService::updateByMerchantId($merchantId, ['wxTMessageInit' => 1]);
 	}

console/controllers/UpgradeController.php

@@ -1069,8 +1069,11 @@ CREATE TABLE `xhStatViewMonth` (
 		$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 '详细地址';";
+ALTER TABLE `xhUser` MODIFY `address` VARCHAR(500) NOT NULL DEFAULT '' COMMENT '详细地址';
+ALTER TABLE `xhTMessage` MODIFY `createTime` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00' COMMENT '创建时间';";
 		Yii::$app->db->createCommand($sql)->execute();
+		
+		
 
 	}