更新涨价设置

app/business/controllers/FestController.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: admin
+ * Date: 2019/12/1
+ * Time: 13:55
+ */
+
+namespace business\controllers;
+
+use biz\saas\services\FestService;
+use Yii;
+use common\components\util;
+
+
+class FestController extends BaseController
+{
+
+	//节日列表 shish 2019.12.8
+	public function actionList()
+	{
+		$fest = FestService::getAllByCondition([], null, '*');
+		util::success($fest);
+	}
+
+}

app/business/controllers/GoodsController.php

@@ -104,4 +104,11 @@ class GoodsController extends BaseController
 		util::ok('提交成功');
 	}
 	
+	//设置 shish 2019.12.8
+	public function actionSetting()
+	{
+		$return = GoodsSettingService::getSetting($this->merchantId);
+		util::success($return);
+	}
+	
 }

biz/goods/services/GoodsSettingService.php

@@ -6,6 +6,8 @@ use biz\admin\services\AdminService;
 use biz\base\services\BaseService;
 
 use biz\goods\classes\GoodsClass;
+use biz\goods\classes\GoodsSettingClass;
+use biz\saas\services\FestRiseService;
 use common\components\util;
 use Yii;
 use linslin\yii2\curl;
@@ -15,4 +17,13 @@ class GoodsSettingService extends BaseService
 	
 	public static $baseFile = '\biz\goods\classes\GoodsSettingClass';
 	
+	//设置 shish 2019.12.8
+	public static function getSetting($merchantId)
+	{
+		$set = GoodsSettingClass::getByCondition(['merchantId' => $merchantId]);
+		$festIdList = FestRiseService::getRiseFestId($merchantId);
+		$set['festIdList'] = $festIdList;
+		return $set;
+	}
+	
 }

biz/saas/classes/FestRiseClass.php

@@ -7,7 +7,14 @@ use biz\base\classes\BaseClass;
 
 class FestRiseClass extends BaseClass
 {
-
-	public static $baseFile = '\biz\saas\models\RiseFest';
+	
+	public static $baseFile = '\biz\saas\models\FestRise';
+	
+	//找出商家要涨价的节日id
+	public static function getRiseFestId($merchantId)
+	{
+		$list = self::getAllByCondition(['merchantId' => $merchantId], null, '*', 'festId');
+		return !empty($list) ? array_keys($list) : [];
+	}
 
 }

biz/saas/models/FestRise.php

@@ -6,10 +6,10 @@ use biz\base\models\Base;
 
 class FestRise extends Base
 {
-
+	
 	public static function tableName()
 	{
-		return 'xhRiseFest';
+		return 'xhFestRise';
 	}
-
+	
 }

biz/saas/services/FestRiseService.php

@@ -3,10 +3,17 @@
 namespace biz\saas\services;
 
 use biz\base\services\BaseService;
+use biz\saas\classes\FestRiseClass;
 
 class FestRiseService extends BaseService
 {
-
-	public static $baseFile = '\biz\saas\classes\RiseFestClass';
+	
+	public static $baseFile = '\biz\saas\classes\FestRiseClass';
+	
+	//找出商家要涨价的节日id
+	public static function getRiseFestId($merchantId)
+	{
+		return FestRiseClass::getRiseFestId($merchantId);
+	}
 
 }

sql.txt

@@ -8,6 +8,7 @@ ALTER TABLE xhMerchantExtend DROP COLUMN `riseType`;
 ALTER TABLE xhMerchantExtend DROP COLUMN `riseAmount`;
 ALTER TABLE xhMerchantExtend DROP COLUMN `createTime`;
 ALTER TABLE xhMerchantExtend DROP COLUMN `updateTime`;
+ALTER TABLE xhGoodsSetting ADD riseSwitch TINYINT NOT NULL DEFAULT 1 COMMENT '自动涨价开关 1开启 0关闭' AFTER `merchantId`;
 
 2019.12.8 shish
 DROP TABLE IF EXISTS xhPic;