广告管理

biz/ad/classes/AdClass.php

@@ -1,7 +1,7 @@
 <?php
 
 namespace biz\ad\classes;
-
+use Yii;
 use \biz\base\classes\BaseClass;
 
 class AdClass extends BaseClass
@@ -13,12 +13,26 @@ class AdClass extends BaseClass
 	public static function getAdList($merchantId)
 	{
 		$time = time();
-		return self::getAllByCondition([
+		$list = self::getAllByCondition([
 			'merchantId' => $merchantId,
+			'type' => 1,
 			'status' => 1,
 			'startTime<' => $time,
 			'endTime>' => $time
 		], 'inTurn DESC', '*');
+		$imgUrl = Yii::$app->params['imgUrl'];
+		if (!empty($list)) {
+			foreach ($list as $key => $val) {
+				$style = $val['style'];
+				$url = $val['url'];
+				if ($style == 1) {
+					$url = '';
+				}
+				$list[$key]['url'] = $url;
+				$list[$key]['adImgUrl'] = $imgUrl . $val['adImg'];
+			}
+		}
+		return $list;
 	}
 	
 }

sql.txt

@@ -2,12 +2,15 @@
 ALTER TABLE xhWxScene MODIFY `type` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '场景类型 0刮刮卡 1邀请有礼领券';
 ALTER TABLE xhShop ADD `openTime` VARCHAR(30) NOT NULL DEFAULT '' COMMENT '营业时间' AFTER `telephone`;
 ALTER TABLE `xhAd` DROP INDEX `merchantId`;
-ALTER TABLE `xhAd` ADD INDEX `merchantId`(`merchantId`);
-ALTER TABLE `xhAd` ADD INDEX `multiple`(`merchantId`,`status`,`startTime`,`endTime`);
+ALTER TABLE `xhAd` ADD INDEX `merchantId`(`merchantId`,`type`);
+ALTER TABLE `xhAd` ADD INDEX `multiple`(`merchantId`,`type`,`status`,`startTime`,`endTime`);
 DELETE FROM `xhAd`;
 ALTER TABLE `xhAd` MODIFY `startTime` INT NOT NULL DEFAULT 0 COMMENT '开始时间';
 ALTER TABLE `xhAd` MODIFY `endTime` INT NOT NULL DEFAULT 0 COMMENT '结束时间；方便查询，永不过期情况，使用 开始值0 结束值4102416000即2100-01-01 00:00:00';
 ALTER TABLE `xhAd` DROP COLUMN `forever`;
+ALTER TABLE xhShop MODIFY shopAddress VARCHAR(200) NOT NULL DEFAULT '' COMMENT '街道地址';
+ALTER TABLE xhShop ADD shopFullAddress VARCHAR(500) NOT NULL DEFAULT '' COMMENT '完整地址' AFTER shopAddress;
+ALTER TABLE xhShop DROP COLUMN `status`;
 
 2019.12.12 shish 我的代理与申请试用
 DROP TABLE IF EXISTS `xhAgentLevel`;