备注完善

app/business/controllers/MerchantRemarkController.php

@@ -2,17 +2,21 @@
 
 namespace business\controllers;
 
-use biz\user\services\UserRemarkService;
+use biz\merchant\services\MerchantRemarkService;
+use common\components\util;
 use Yii;
 
-class UserRemarkController extends BaseController
+class MerchantRemarkController extends BaseController
 {
+
 	//删除备注
 	public function actionDelete()
 	{
-		$id = Yii::$pp->request->get('id');
-		$remark = UserRemarkService::getBYId($id);
-		UserRemarkService::check($remark,$this->userId);
+		$id = Yii::$app->request->get('id');
+		$remark = MerchantRemarkService::getById($id);
+		MerchantRemarkService::valid($remark, $this->merchantId);
+		MerchantRemarkService::deleteById($id);
+		util::ok('删除成功');
 	}
-	
+
 }

biz/merchant/classes/MerchantRemarkClass.php

@@ -1,5 +1,5 @@
 <?php
-namespace biz\user\classes;
+namespace biz\merchant\classes;
 
 use Yii;
 use biz\base\classes\BaseClass;
@@ -7,6 +7,6 @@ use biz\base\classes\BaseClass;
 class MerchantRemarkClass extends BaseClass
 {
 
-	public static $baseFile = '\biz\user\models\MerchantRemark';
+	public static $baseFile = '\biz\merchant\models\MerchantRemark';
 
 }

biz/merchant/models/merchantRemark.php

@@ -1,5 +1,5 @@
 <?php
-namespace biz\user\models;
+namespace biz\merchant\models;
 use biz\base\models\Base;
 
 class MerchantRemark extends Base

biz/merchant/services/MerchantRemarkService.php

@@ -1,20 +1,33 @@
 <?php
 
-namespace biz\user\services;
+namespace biz\merchant\services;
 
 use biz\base\services\BaseService;
-use biz\user\classes\MerchantRemarkClass;
+use biz\merchant\classes\MerchantRemarkClass;
+use common\components\util;
 use Yii;
 use common\components\weixinUtil;
 
 class MerchantRemarkService extends BaseService
 {
 	
-	public static $baseFile = '\biz\user\classes\MerchantRemarkClass';
+	public static $baseFile = '\biz\merchant\classes\MerchantRemarkClass';
 	
+	//备注列表 shish 2019.12.19
 	public static function getRemarkList($userId)
 	{
 		return MerchantRemarkClass::getAllByCondition(['userId' => $userId], null, '*');
 	}
+
+	//备注验证 2019.12.19
+	public static function valid($remark, $merchantId)
+	{
+		if (empty($remark)) {
+			util::fail('备注无效');
+		}
+		if ($remark['merchantId'] != $merchantId) {
+			util::fail('您没有权限操作');
+		}
+	}
 	
 }