字段完善

app/business/controllers/CategoryController.php

@@ -81,7 +81,7 @@ class CategoryController extends BaseController
 	{
 		$categoryId = Yii::$app->request->get('categoryId');
 		//没有分类默认取商家第一个分类
-		$categoryId = !empty($categoryId) ? $categoryId : CategoryService::getTopCategoryId();
+		$categoryId = !empty($categoryId) ? $categoryId : CategoryService::getTopCategoryId($this->merchantId);
 		$where = [];
 		$where['merchantId'] = $this->merchantId;
 		$where['cId'] = $categoryId;

app/client/controllers/AuthController.php

@@ -125,10 +125,6 @@ class AuthController extends PublicController
 			}
 		}
 		//这个的基类没有设置统一的全局变量，这里进行设置一次
-		Yii::$app->params['userId'] = $user['id'];
-		Yii::$app->params['user'] = $user;
-		Yii::$app->params['merchantId'] = $merchantId;
-		Yii::$app->params['merchant'] = $merchant;
 		$userId = $user['id'];
 		//获取token
 		$token = jwt::getNewToken($userId);

app/client/controllers/BaseController.php

@@ -44,11 +44,8 @@ class BaseController extends PublicController
 		$this->merchantId = $account;
 		$this->merchant = $merchant;
 		$this->merchantExtend = MerchantExtendService::getByMerchantId($account);
-		Yii::$app->params['merchantId'] = $account;
-		Yii::$app->params['merchant'] = $merchant;
-		Yii::$app->params['userId'] = $userId;
 		$this->isWeixin = util::isWeixin();
-		
+
 		if (empty($userId)) {
 			$this->validate = false;
 		} else {

app/client/controllers/CategoryController.php

@@ -23,7 +23,7 @@ class CategoryController extends BaseController
 	{
 		$categoryId = Yii::$app->request->get('categoryId');
 		//没有分类默认取商家第一个分类
-		$categoryId = !empty($categoryId) ? $categoryId : CategoryService::getTopCategoryId();
+		$categoryId = !empty($categoryId) ? $categoryId : CategoryService::getTopCategoryId($this->merchantId);
 		$where = [];
 		$where['merchantId'] = $this->merchantId;
 		$where['cId'] = $categoryId;

app/client/controllers/MainController.php

@@ -18,7 +18,7 @@ class MainController extends BaseController
 			['adImg' => 'http://img.fjglhs.com/images/glhs/glhs_banner2.jpg', 'url' => 'http://www.baidu.com'],
 			['adImg' => 'http://img.fjglhs.com/images/glhs/glhs_banner3.jpg', 'url' => 'http://www.baidu.com'],
 		];
-		$category = CategoryService::getTopThreeCategory();
+		$category = CategoryService::getTopThreeCategory($this->merchantId);
 		$categoryList = !empty($category) ? GoodsCategoryService::getAppointCategoryList($category) : [];
 		$data = ['ad' => $ad, 'category' => $categoryList, 'columnStyle' => rand(1, 2)];
 		util::success($data);

app/client/controllers/PayController.php

@@ -194,13 +194,7 @@ class PayController extends BaseController
 		//没有优惠卷，微信朋友圈付款才给随机优惠金额 shish 2019.9.12
 		if ($sourceType == 2 && empty($couponId)) {
 			$discountAmount = OrderService::getRandDiscount($actPrice);
-			//测试环境直接随机优惠0.01
-			if (isset(Yii::$app->params['merchant'])) {
-				$merchant = Yii::$app->params['merchant'];
-				if ($merchant['merchantName'] == '花美灵') {
-					$discountAmount = 0.01;
-				}
-			}
+			$discountAmount = 0.01;
 			$actPrice = stringUtil::calcSub($actPrice, $discountAmount);
 			$post['discountType'] = 2;//优惠类型是：付款随机优惠
 			$post['discountAmount'] = $discountAmount;

app/client/controllers/UserController.php

@@ -22,9 +22,8 @@ class UserController extends BaseController
 	}
 	
 	//获取登陆客户的优惠情况  shish 2019.12.3
-	public function actionDiscount()
+	public function actionDiscount($userId)
 	{
-		$userId = Yii::$app->params['userId'];
 		$discount = UserAssetService::getDiscount($userId);
 		util::success($discount);
 	}

app/open/controllers/WxController.php

@@ -108,7 +108,6 @@ class WxController extends PublicController
 		if (!empty($merchant)) {
 			$account = $merchant['id'];
 			$merchantId = $merchant['id'];
-			Yii::$app->params['merchantId'] = $merchantId;
 			$merchantExtend = xhMerchantExtendService::getByMerchantId($merchantId);
 		}
 		$user = xhUserService::getByOpenId($this->fromUsername, $merchantId);

app/www/controllers/WxController.php

@@ -108,7 +108,6 @@ class WxController extends PublicController
 		if (!empty($merchant)) {
 			$account = $merchant['id'];
 			$merchantId = $merchant['id'];
-			Yii::$app->params['merchantId'] = $merchantId;
 			$merchantExtend = xhMerchantExtendService::getByMerchantId($merchantId);
 		}
 		$user = xhUserService::getByOpenId($this->fromUsername, $merchantId);

biz/goods/services/CategoryService.php

@@ -58,18 +58,16 @@ class CategoryService extends BaseService
 	
 	
 	//获取商家最靠前的分类id shish 2019.12.2
-	public static function getTopCategoryId()
+	public static function getTopCategoryId($merchantId)
 	{
-		$merchantId = Yii::$app->params['merchantId'];
 		$cat = CategoryClass::getByCondition(['merchantId' => $merchantId, 'status' => 1], false, 'inTurn DESC');
 		$id = isset($cat['id']) ? $cat['id'] : 0;
 		return $id;
 	}
 	
 	//获取前三个分类信息 shish 2019.12.2
-	public static function getTopThreeCategory()
+	public static function getTopThreeCategory($merchantId)
 	{
-		$merchantId = Yii::$app->params['merchantId'];
 		$cat = CategoryClass::getLimitList('id,categoryName', ['merchantId' => $merchantId, 'status' => 1], 3, 'inTurn DESC');
 		if (empty($cat)) {
 			return [];

biz/promote/services/CouponModelService.php

@@ -14,9 +14,8 @@ class CouponModelService extends BaseService
 	public static $baseFile = '\biz\promote\classes\CouponModelClass';
 	
 	//列出商家所有的卷模板
-	public static function getCouponList()
+	public static function getCouponList($merchantId)
 	{
-		$merchantId = Yii::$app->params['merchantId'];
 		$list = self::getAllList('*', ['merchantId' => $merchantId], 'level desc');
 		return $list;
 	}
@@ -86,7 +85,7 @@ class CouponModelService extends BaseService
 	}
 	
 	//添加或更新卷模板 shish 2019.8.18
-	public static function replaceModel($data)
+	public static function replaceModel($data, $merchantId)
 	{
 		$valid = array_keys($data);
 		$diff = array_diff(['type', 'targetId', 'amount', 'meetAmount', 'reward', 'name', 'id'], $valid);
@@ -94,7 +93,6 @@ class CouponModelService extends BaseService
 			error::instance()->setError('参数错误');
 			return false;
 		}
-		$merchantId = Yii::$app->params['merchantId'];
 		$type = $data['type'];
 		$id = $data['id'];
 		unset($data['id']);
@@ -113,7 +111,7 @@ class CouponModelService extends BaseService
 		}
 		$time = time();
 		$createTime = date("Y-m-d H:i:s");
-		$data['merchantId'] = Yii::$app->params['merchantId'];
+		$data['merchantId'] = $merchantId;
 		$data['addTime'] = $time;
 		$data['createTime'] = $createTime;
 		self::add($data);
@@ -121,23 +119,20 @@ class CouponModelService extends BaseService
 	}
 	
 	//取出按商品分类设置的优惠券 shish 2019.8.18
-	public static function getCategoryCoupon()
+	public static function getCategoryCoupon($merchantId)
 	{
-		$merchantId = Yii::$app->params['merchantId'];
 		return self::getAllByCondition(['merchantId' => $merchantId, 'type' => 1], null, '*', 'targetId');
 	}
 	
 	//取出按用途设置的优惠券 shish 2019.8.18
-	public static function getUsageCoupon()
+	public static function getUsageCoupon($merchantId)
 	{
-		$merchantId = Yii::$app->params['merchantId'];
 		return self::getAllByCondition(['merchantId' => $merchantId, 'type' => 2], null, '*', 'targetId');
 	}
 	
 	//取优惠卷信息并确认是否商家自己的
-	public static function getCouponInfo($id)
+	public static function getCouponInfo($id, $merchantId)
 	{
-		$merchantId = Yii::$app->params['merchantId'];
 		$info = self::getById($id);
 		if (empty($info)) {
 			util::fail('没有优惠卷信息');

biz/promote/services/CouponRewardService.php

@@ -13,7 +13,7 @@ class CouponRewardService extends BaseService
 	public static $baseFile = '\biz\promote\classes\CouponRewardClass';
 	
 	//发放奖品 shish 2019,8.25
-	public static function grantReward($data)
+	public static function grantReward($data, $merchantId)
 	{
 		validate::easyCheck(['id'], $data);
 		$id = $data['id'];
@@ -21,7 +21,6 @@ class CouponRewardService extends BaseService
 		if (empty($reward)) {
 			util::fail('没有找到奖励');
 		}
-		$merchantId = Yii::$app->params['merchantId'];
 		if ($merchantId != $reward['merchantId']) {
 			util::fail('没有权限操作');
 		}

biz/promote/services/CouponRightService.php

@@ -21,9 +21,7 @@ class CouponRightService extends BaseService
 	//给用户增加发卷的权力 shish
 	public static function addRight($order)
 	{
-		$categoryId = $order['categoryId'];
-		$usageId = $order['usageId'];
-		$userId = Yii::$app->params['userId'];
+
 	}
 	
 	//老带新详情和优惠卷详情 shish 2019.8.25
@@ -42,12 +40,11 @@ class CouponRightService extends BaseService
 	//我的可以分享的优惠卷 shish
 	public static function myShare()
 	{
-		$userId = Yii::$app->params['userId'];
-		$list = self::getAllByCondition(['userId' => $userId]);
+
 	}
 	
 	//给予老带新优惠卷发放权 shish
-	public static function grantRight($order)
+	public static function grantRight($order, $merchant)
 	{
 		$categoryId = $order['categoryId'];
 		$usageId = $order['usageId'];
@@ -82,13 +79,12 @@ class CouponRightService extends BaseService
 		
 		//消息通知
 		$allTM = xhTMessageService::getList($merchantId);
-		$merchant = Yii::$app->params['merchant'];
 		$user = UserService::getById($userId);
 		
 		if ($user['subscribe'] == 1) {
 			$shortTempId = 'OPENTM207422813';//收入提醒
 			if (isset($allTM[$shortTempId])) {
-				$tempId =  $allTM[$shortTempId];
+				$tempId = $allTM[$shortTempId];
 				$openId = $user['openId'];
 				$data = ["touser" => $openId, "template_id" => $tempId,
 					"url" => Yii::$app->params['mobileUrl'] . '/center/my-right?account=' . $merchant['id'],
@@ -104,7 +100,7 @@ class CouponRightService extends BaseService
 	}
 	
 	//分享出去之后领取优惠卷 shish
-	public static function gainCoupon($data)
+	public static function gainCoupon($data,$userId)
 	{
 		validate::easyCheck(['rightId'], $data);
 		$rightId = $data['rightId'];
@@ -112,7 +108,6 @@ class CouponRightService extends BaseService
 		if (empty($right)) {
 			util::fail('没有找到优惠卷');
 		}
-		$userId = Yii::$app->params['userId'];
 		if ($right['userId'] == $userId) {
 			util::fail('不能领自己发的卷');
 		}
@@ -172,7 +167,7 @@ class CouponRightService extends BaseService
 			$allTM = xhTMessageService::getList($merchantId);
 			$shortTempId = 'OPENTM207430125';
 			if (isset($allTM[$shortTempId])) {
-				$tempId =  $allTM[$shortTempId];
+				$tempId = $allTM[$shortTempId];
 				$url = Yii::$app->params['mobileUrl'] . '/center/my-coupon?account=' . $merchantId;
 				$data = [
 					"touser" => $openId, "template_id" => $tempId, "url" => $url,
@@ -192,7 +187,7 @@ class CouponRightService extends BaseService
 			$allTM = xhTMessageService::getList($merchantId);
 			$shortTempId = 'OPENTM207430125';
 			if (isset($allTM[$shortTempId])) {
-				$tempId =  $allTM[$shortTempId];
+				$tempId = $allTM[$shortTempId];
 				$url = Yii::$app->params['mobileUrl'] . '/center/get-coupon?account=' . $merchantId;
 				$data = [
 					"touser" => $openId, "template_id" => $tempId, "url" => $url,

biz/promote/services/CouponService.php

@@ -15,9 +15,9 @@ use Yii;
 
 class CouponService extends BaseService
 {
-
+	
 	public static $baseFile = '\biz\promote\classes\CouponClass';
-
+	
 	//优惠券列表 shish 2019.12.11
 	public static function getCouponList($where)
 	{
@@ -52,9 +52,9 @@ class CouponService extends BaseService
 		}
 		return $coupon['amount'];
 	}
-
+	
 	//销卷并分成 shish 2019.8.25
-	public static function destroyToGetReward($data)
+	public static function destroyToGetReward($data, $merchantId)
 	{
 		validate::easyCheck(['id'], $data);
 		$couponId = $data['id'];
@@ -65,7 +65,6 @@ class CouponService extends BaseService
 		if (empty($coupon)) {
 			util::fail('找不到优惠卷');
 		}
-		$merchantId = Yii::$app->params['merchantId'];
 		if ($coupon['merchantId'] != $merchantId) {
 			util::fail('你没有权限操作');
 		}
@@ -126,18 +125,15 @@ class CouponService extends BaseService
 	}
 	
 	//是否领取过老带新的卷 shish 2019.8.25
-	public static function hasGained()
+	public static function hasGained($userId, $merchantId)
 	{
-		$userId = Yii::$app->params['userId'];
-		$merchantId = Yii::$app->params['merchantId'];
 		$return = self::getByCondition(['merchantId' => $merchantId, 'userId' => $userId]);
 		return empty($return) ? false : true;
 	}
 	
 	//获取我的优惠卷 $status null全部 0未使用 1使用 2过期
-	public static function getMyCoupon($status = null)
+	public static function getMyCoupon($userId, $status = null)
 	{
-		$userId = Yii::$app->params['userId'];
 		$where = ['userId' => $userId];
 		if (isset($status) != false) {
 			$where['status'] = $status;
@@ -146,11 +142,9 @@ class CouponService extends BaseService
 	}
 	
 	//取出部分可用的优惠卷 shish 2019.8.28
-	public static function getAvailableCouponList($data)
+	public static function getAvailableCouponList($data, $userId, $merchantId)
 	{
 		validate::easyCheck(['categoryId', 'usageId', 'amount'], $data);
-		$merchantId = Yii::$app->params['merchantId'];
-		$userId = Yii::$app->params['userId'];
 		$amount = $data['amount'];
 		$categoryId = $data['categoryId'];
 		$usageId = $data['usageId'];
@@ -182,10 +176,8 @@ class CouponService extends BaseService
 	}
 	
 	//判断用户是否有卷
-	public static function hasCoupon()
+	public static function hasCoupon($userId, $merchantId)
 	{
-		$merchantId = Yii::$app->params['merchantId'];
-		$userId = Yii::$app->params['userId'];
 		$list = self::getAllByCondition(['merchantId' => $merchantId, 'userId' => $userId], 'id desc', '*');
 		$hasCoupon = false;
 		$time = time();
@@ -217,10 +209,8 @@ class CouponService extends BaseService
 	
 	
 	//付款成功后领取优惠券 shish 2019.9.17
-	public static function paySuccessGetCoupon()
+	public static function paySuccessGetCoupon($userId, $merchantId)
 	{
-		$userId = Yii::$app->params['userId'];
-		$merchantId = Yii::$app->params['merchantId'];
 		/**确认是否可领卷**/
 		$flag = UserAssetService::couldGetCoupon($userId);
 		if ($flag == -1) {

biz/promote/services/GuaGuaAttendService.php

@@ -12,10 +12,9 @@ class GuaGuaAttendService extends BaseService
 	public static $baseFile = '\biz\promote\classes\GuaGuaAttendClass';
 	
 	//确认还有没抽奖机会，如果还有则用户抽奖次数+1 shish 2019.8.10
-	public static function confirmToAddTime($card)
+	public static function confirmToAddTime($card, $userId, $merchantId)
 	{
 		$id = $card['id'];
-		$userId = Yii::$app->params['userId'];
 		$attend = GuaGuaAttendService::getByCondition(['cardId' => $id, 'userId' => $userId], true);
 		if (empty($card['drawCount']) == false && isset($attend->num) && $card['drawCount'] <= $attend->num) {
 			error::instance()->setError('你的抽奖次数已经用完了');
@@ -23,7 +22,7 @@ class GuaGuaAttendService extends BaseService
 		}
 		if (empty($attend)) {
 			//增加抽奖记录
-			$merchantId = Yii::$app->params['merchantId'];
+			
 			$addTime = time();
 			$date = date("Y-m-d H:i:s");
 			$data = ['merchantId' => $merchantId, 'userId' => $userId, 'cardId' => $id, 'num' => 1, 'addTime' => $addTime, 'createTime' => $date];
@@ -39,13 +38,12 @@ class GuaGuaAttendService extends BaseService
 	}
 	
 	//获取用户剩余刮卡次数 shish 2019.8.10
-	public static function getRemainNum($card)
+	public static function getRemainNum($card, $userId)
 	{
 		//-1表示一直可以刮
 		if (empty($card['drawCount'])) {
 			return -1;
 		}
-		$userId = Yii::$app->params['userId'];
 		$id = $card['id'];
 		$attend = self::getByCondition(['cardId' => $id, 'userId' => $userId]);
 		$usedNum = isset($attend['num']) ? $attend['num'] : 0;

biz/promote/services/GuaGuaPrizeService.php

@@ -13,14 +13,13 @@ class GuaGuaPrizeService extends BaseService
 	public static $baseFile = '\biz\promote\classes\GuaGuaPrizeClass';
 	
 	//抽奖 shish 2019.8.10
-	public static function getPrize($id)
+	public static function getPrize($id, $userId, $merchantId)
 	{
 		$card = GuaGuaService::getById($id);
 		if (empty($card)) {
 			error::instance()->setError('活动不存在');
 			return false;
 		}
-		$merchantId = Yii::$app->params['merchantId'];
 		if ($merchantId != $card['merchantId']) {
 			error::instance()->setError('不是你的活动，你没有权限访问');
 			return false;
@@ -53,8 +52,6 @@ class GuaGuaPrizeService extends BaseService
 			return false;
 		}
 		
-		$userId = Yii::$app->params['userId'];
-		
 		/**进行抽奖。总中奖率1000，减掉奖品的机率剩下的就是不中奖的机率**/
 		$unWinNum = 1000 - $getChanceTotalNum;
 		$formatList[] = ['id' => 0, 'v' => $unWinNum];

biz/promote/services/GuaGuaService.php

@@ -41,13 +41,12 @@ class GuaGuaService extends BaseService
 	}
 	
 	//访问次数和用户数增加 shish 2019.8.12
-	public static function addVisit($id)
+	public static function addVisit($id, $userId)
 	{
 		$key = GuaGuaClass::getGuGuaVisitCacheKey($id);
 		Yii::$app->redis->executeCommand('INCR', [$key]);
-		if (Yii::$app->params['isLogin']) {
+		if (isset(Yii::$app->params['isLogin'])) {
 			$key = GuaGuaClass::getGuaGuaVisitUserCacheKey($id);
-			$userId = Yii::$app->params['userId'];
 			Yii::$app->redis->executeCommand('SADD', [$key, $userId]);
 		}
 	}
@@ -95,14 +94,13 @@ class GuaGuaService extends BaseService
 		$total = $todayNum + $card['visitUser'] + $yesNum;
 		return $total;
 	}
-
+	
 	//取最新的活动id，没有活动返回0 shish 2019.9.25
-	public static function getNewestId()
+	public static function getNewestId($merchantId)
 	{
-		$merchantId = Yii::$app->params['merchantId'];
 		$respond = self::getByCondition(['merchantId' => $merchantId], true, 'id desc');
 		$id = !empty($respond) ? $respond->id : 0;
 		return $id;
 	}
-
+	
 }

biz/promote/services/GuaGuaWinService.php

@@ -14,15 +14,13 @@ class GuaGuaWinService extends BaseService
 	public static $baseFile = '\biz\promote\classes\GuaGuaWinClass';
 	
 	//获取自己的奖品 shish 2019.8.10
-	public static function getMyPrize($id)
+	public static function getMyPrize($id, $userId,$merchantId)
 	{
-		$merchantId = Yii::$app->params['merchantId'];
 		$card = GuaGuaService::getById($id);
 		if ($card['merchantId'] != $merchantId) {
 			error::instance()->setError('你没有权限');
 			return false;
 		}
-		$userId = Yii::$app->params['userId'];
 		$list = self::getAllByCondition(['cardId' => $id, 'userId' => $userId], null, '*');
 		if (empty($list)) {
 			return [];
@@ -38,14 +36,13 @@ class GuaGuaWinService extends BaseService
 	}
 	
 	//发放奖品 shish 2019.8.11
-	public static function setPrizeGet($id)
+	public static function setPrizeGet($id, $merchantId)
 	{
 		$win = self::getById($id);
 		if (empty($win)) {
 			error::instance()->setError('没有获奖信息');
 			return false;
 		}
-		$merchantId = Yii::$app->params['merchantId'];
 		if ($win['merchantId'] != $merchantId) {
 			error::instance()->setError('你没有权限操作' . $win['merchantId'] . ' | ' . $merchantId);
 			return false;

biz/stat/services/StatIncomeCategoryService.php

@@ -46,9 +46,8 @@ class StatIncomeCategoryService extends BaseService
 	}
 	
 	//取最近的按分类的收入 shish 2019.9.26
-	public static function getLatestIncome($start, $end)
+	public static function getLatestIncome($start, $end,$merchantId)
 	{
-		$merchantId = Yii::$app->params['merchantId'];
 		$list = self::getAllList('categoryId,amount', ['merchantId' => $merchantId, 'time' => ['between', [$start, $end]]], 'time asc');
 		$totalAmount = 0;
 		$categoryList = CategoryRelateService::getCategoryData();

biz/stat/services/StatIncomeService.php

@@ -12,16 +12,14 @@ class StatIncomeService extends BaseService
 	public static $baseFile = '\biz\stat\classes\StatIncomeClass';
 	
 	//取今天的数据 shish 2019.9.8
-	public static function getTodayNum()
+	public static function getTodayNum($merchantId)
 	{
-		$merchantId = Yii::$app->params['merchantId'];
 		$today = date("Ymd");
 		return self::getByCondition(['merchantId' => $merchantId, 'time' => $today]);
 	}
-
-	public static function checkUp($id)
+	
+	public static function checkUp($id, $merchantId)
 	{
-		$merchantId = Yii::$app->params['merchantId'];
 		$stat = self::getById($id, true);
 		if ($stat->merchantId != $merchantId) {
 			util::fail('你没有权限');
@@ -35,9 +33,8 @@ class StatIncomeService extends BaseService
 	}
 	
 	//获取最近的收入情况 shish 2019.9.21
-	public static function getLatestIncome($start, $end)
+	public static function getLatestIncome($start, $end,$merchantId)
 	{
-		$merchantId = Yii::$app->params['merchantId'];
 		$list = self::getAllList('*', ['merchantId' => $merchantId, 'time' => ['between', [$start, $end]]], 'time asc');
 		return $list;
 	}

biz/stat/services/StatIncomeSourceService.php

@@ -47,9 +47,8 @@ class StatIncomeSourceService extends BaseService
 	}
 	
 	//取最近的按来源分的收入 shish 2019.9.21
-	public static function getLatestSource($start, $end)
+	public static function getLatestSource($start, $end, $merchantId)
 	{
-		$merchantId = Yii::$app->params['merchantId'];
 		$list = self::getAllList('sourceType,amount', ['merchantId' => $merchantId, 'time' => ['between', [$start, $end]]], 'time asc');
 		$data = [];
 		$sourceType = UserClass::$sourceType;
@@ -66,7 +65,7 @@ class StatIncomeSourceService extends BaseService
 				$totalAmount = stringUtil::calcAdd($totalAmount, $amount);
 			}
 		}
-
+		
 		return ['data' => array_values($data), 'sourceTypeName' => $sourceType, 'totalAmount' => $totalAmount];
 	}
 	

biz/stat/services/StatIncomeUsageService.php

@@ -47,9 +47,8 @@ class StatIncomeUsageService extends BaseService
 		$income->save();
 	}
 
-	public static function getLatestIncome($start, $end)
+	public static function getLatestIncome($start, $end,$merchantId)
 	{
-		$merchantId = Yii::$app->params['merchantId'];
 		$list = self::getAllList('usageId,amount', ['merchantId' => $merchantId, 'time' => ['between', [$start, $end]]], 'time asc');
 		$totalAmount = 0;
 		$usageList = UsageRelationService::getMyUsage();

biz/stat/services/StatUserService.php

@@ -10,10 +10,9 @@ class StatUserService extends BaseService
 	
 	public static $baseFile = '\biz\stat\classes\StatUserClass';
 	
-	public static function getTodayNum()
+	public static function getTodayNum($merchantId)
 	{
 		$today = date("Ymd");
-		$merchantId = Yii::$app->params['merchantId'];
 		return self::getByCondition(['merchantId' => $merchantId, 'time' => $today]);
 	}
 	

biz/weixin/services/WxSceneService.php

@@ -3,6 +3,7 @@
 namespace biz\weixin\services;
 
 use biz\base\services\BaseService;
+use biz\merchant\services\MerchantService;
 use biz\promote\services\CouponService;
 use common\components\util;
 use common\services\xhTMessageService;
@@ -17,10 +18,9 @@ class WxSceneService extends BaseService
 	public static $baseFile = '\biz\weixin\classes\WxSceneClass';
 	
 	//生成刮刮卡的场景id shish 2019.9.5
-	public static function generateGuaGuaScene($id)
+	public static function generateGuaGuaScene($id, $merchantId)
 	{
-		$merchantId = Yii::$app->params['merchantId'];
-		$merchant = Yii::$app->params['merchant'];
+		$merchant = MerchantService::getById($merchantId);
 		$time = time();
 		$sceneId = stringUtil::generateSceneId($merchantId);
 		$type = 0;
@@ -36,10 +36,8 @@ class WxSceneService extends BaseService
 	}
 	
 	//生成支付成功领卷的场景 shish 2019.9.17
-	public static function generatePayGetCouponScene($userId)
+	public static function generatePayGetCouponScene($userId,$merchantId,$merchant)
 	{
-		$merchantId = Yii::$app->params['merchantId'];
-		$merchant = Yii::$app->params['merchant'];
 		$time = time();
 		$sceneId = stringUtil::generateSceneId($merchantId);
 		$type = 1;
@@ -84,14 +82,12 @@ class WxSceneService extends BaseService
 			if ($info->status == 1) {
 				return false;
 			}
-			Yii::$app->params['userId'] = $user['id'];
-			Yii::$app->params['merchantId'] = $merchantId;
-			CouponService::paySuccessGetCoupon();
+			CouponService::paySuccessGetCoupon($userId,$merchantId);
 			$info->status = 1;
 			$info->save();
 		} else {
 		
 		}
 	}
-
+	
 }

common/services/xhCategoryService.php

@@ -153,9 +153,8 @@ class xhCategoryService
 	}
 
 	//取出要显示的菜单分类
-	public static function getShowList()
+	public static function getShowList($merchantId)
 	{
-		$merchantId = Yii::$app->params['merchantId'];
 		$data = xhCategory::find()->where(['merchantId' => $merchantId, 'isShow' => 1])->limit(8)->orderBy('inTurn desc')->asArray()->all();
 		return $data;
 	}

相关文档/开发规范.md

@@ -84,12 +84,6 @@ service可以调用class
 
 前期开发的时候你会发现class有点多余，但业务越来越复杂时，你就会发现class层的价值
 
-因为分层比较深，对一些各层都要使用到的参数，我们不必一直往下传。
-只要在最顶层设置一个全局的变量，底下各层各方法都可以调用。
-````
-Yii::$app->params['userId'] = 1;
-Yii::$app->params['merchantId'] = 12358;
-````
 
 ##### 注释规范
 ````