sql

biz/message/classes/InformAdminClass.php

@@ -65,6 +65,12 @@ class InformAdminClass extends BaseClass
 		$producer->publish($msg, 'informExchange', 'informRoute');
 		
 	}
+
+	//宝贝售出提醒 shish 2020.5.31
+	public static function goodsSoldInform($params, $admin, $TMList)
+	{
+	
+	}
 	
 	//送到通知 shish 2020.1.31
 	public static function sendInform($params, $admin, $TMList)

biz/message/services/InformAdminService.php

@@ -53,11 +53,7 @@ class InformAdminService extends BaseService
 		$adminId = $adminShop['adminId'];
 		$mobile = $data['mobile'];
 		$isOpen = isset($data['isOpen']) ? $data['isOpen'] : 0;
-		if ($isOpen == 1) {
-			$merchant = WxOpenService::getWxInfo();
-		} else {
-			$merchant = MerchantService::getMerchantById($merchantId);
-		}
+		$merchant = WxOpenService::getWxInfo();
 		$hasSend = 0;
 		$noticeWay = 0;
 		if ($informWay == 'wx') {

console/controllers/UpgradeController.php

@@ -1466,6 +1466,8 @@ UPDATE `xhUserAsset` SET `member`=0 WHERE `member`=-1;";
 		$sql = "ALTER TABLE `xhGoodsCategory` MODIFY `inTurn` INT NOT NULL DEFAULT 0 COMMENT '排序';ALTER TABLE `xhGoodsCategory` ADD `addTime` INT NOT NULL DEFAULT 0 COMMENT '添加时间' AFTER `inTurn`;";
 		Yii::$app->db->createCommand($sql)->execute($sql);
 
+		$sql = "ALTER TABLE `xhInformAdmin` DROP COLUMN `userId`;";
+		Yii::$app->db->createCommand($sql)->execute($sql);
 	}
 
 	//数据迁移 shish 2020.1.12