merchant

app/www/controllers/BaseController.php

@@ -13,7 +13,7 @@ use yii\web\Controller;
 class BaseController extends PublicController
 {
 	
-	public $staff, $staffId, $userId, $user,$merchantId;
+	public $staff, $staffId, $userId, $user, $merchantId;
 	public $isLogin = false;
 	public $withoutLogin = [];//不需要登陆的方法名
 	public $validate = true;
@@ -35,7 +35,6 @@ class BaseController extends PublicController
 		if ($this->validate == false) {
 			util::notLogin();
 		}
-		
 		$this->staff = $staff;
 		$this->staffId = $staffId;
 		$this->user = $staff;
@@ -43,5 +42,5 @@ class BaseController extends PublicController
 		$this->merchantId = 12359;
 		return parent::beforeAction($action);
 	}
-	
+
 }

app/www/controllers/RenewController.php

@@ -43,7 +43,6 @@ class RenewController extends BaseController
 		$order = RenewService::addOrder($addData);
 		$orderId = $order['id'];
 		$orderSn = $order['orderSn'];
-		$merchantId = $merchantId;
 		$couponId = 0;
 		$name = '购买' . $set['name'];
 		$totalFee = $actPrice;