门店添加修改

biz/merchant/classes/ShopClass.php

@@ -2,6 +2,7 @@
 
 namespace biz\merchant\classes;
 
+use common\components\util;
 use Yii;
 use biz\base\classes\BaseClass;
 
@@ -25,22 +26,44 @@ class ShopClass extends BaseClass
 	//创建门店 shish 2020.2.8
 	public static function addShop($data)
 	{
+		$data['createTime'] = date("Y-m-d H:i:s");
+		$shopName = isset($data['shopName']) ? $data['shopName'] : '';
+		if (empty($shopName)) {
+			util::fail('请填写门店名称');
+		}
+		$exists = self::getByCondition(['merchantId' => $data['merchantId'], 'shopName' => $shopName]);
+		if (!empty($exists)) {
+			util::fail('门店名称已经存在');
+		}
 		return self::add($data);
 	}
-
+	
 	//更新门店 shish 2020.2.29
 	public static function updateShop($id, $data)
 	{
+		$shop = self::getById($id);
+		$shopName = isset($data['shopName']) ? $data['shopName'] : '';
+		$merchantId = $data['merchantId'];
+		$findShop = self::getByCondition(['merchantId' => $merchantId, 'shopName' => $shopName]);
+		if (!empty($findShop) && $findShop['id'] != $id) {
+			util::fail('门店名称已经存在');
+		}
 		return self::updateById($id, $data);
 	}
+
+	//取商家所有门店 shish 2020.2.29
+	public static function getAllShop($merchantId)
+	{
+		return self::getAllByCondition(['merchantId' => $merchantId]);
+	}
 	
 	//验证所属权限 shish 2020.2.29
-	public static function valid($shopInfo, $merchantId)
+	public static function valid($shop, $merchantId)
 	{
-		if (empty($shopInfo)) {
+		if (empty($shop)) {
 			util::fail('门店无效');
 		}
-		if (isset($shopInfo['merchantId']) == false || $shopInfo['merchantId'] != $merchantId) {
+		if (isset($shop['merchantId']) == false || $shop['merchantId'] != $merchantId) {
 			util::fail('您没有权限访问');
 		}
 	}

biz/merchant/services/ShopService.php

@@ -45,7 +45,7 @@ class ShopService extends BaseService
 	//验证门店
 	public static function valid($shopInfo, $merchantId)
 	{
-		ShopClass::valid($shopInfo,$merchantId);
+		ShopClass::valid($shopInfo, $merchantId);
 	}
 	
 	public static function getShopList($where)
@@ -65,11 +65,11 @@ class ShopService extends BaseService
 	{
 		return ShopClass::addShop($data);
 	}
-
+	
 	//更新门店 shish 2020.2.29
-	public static function updateShop($data)
+	public static function updateShop($id, $data)
 	{
-		return ShopClass::updateShop($data);
+		return ShopClass::updateShop($id, $data);
 	}
-
+	
 }