增加商家名称

biz/goods/classes/GoodsClass.php

@@ -4,6 +4,7 @@ namespace biz\goods\classes;
 
 use biz\goods\services\GoodsCategoryService;
 use biz\goods\services\GoodsStyleService;
+use biz\merchant\services\MerchantService;
 use common\components\business;
 use common\components\stringUtil;
 use Yii;
@@ -32,6 +33,9 @@ class GoodsClass extends BaseClass
 	//组装商品基本信息 shish 2019.12.2
 	public static function groupGoodsBaseInfo($list)
 	{
+		$merchantIdList = array_column($list, 'merchantId');
+		$merchantIdList = array_unique(array_filter($merchantIdList));
+		$merchantList = MerchantService::getByIds($merchantIdList, null, 'id');
 		foreach ($list as $key => $val) {
 			$id = $val['id'];
 			//大中小图片转化
@@ -42,12 +46,14 @@ class GoodsClass extends BaseClass
 			//多款式
 			$val['goodsStyleList'] = isset($val['goodsStyle']) && $val['goodsStyle'] == 1 ? GoodsStyleService::getStyle($id) : [];
 			$val['createDate'] = date("Y-m-d", strtotime($val['createTime']));
+			$merchantId = $val['merchantId'];
+			$val['merchantName'] = isset($merchantList[$merchantId]['merchantName']) ? $merchantList[$merchantId]['merchantName'] : '';
 			$list[$key] = $val;
 			//涨价
 		}
 		return $list;
 	}
-	
+
 	public static function addGoods($data)
 	{
 		$categoryIdList = isset($data['categoryIdList']) && !empty($data['categoryIdList']) ? $data['categoryIdList'] : [];
@@ -155,5 +161,5 @@ class GoodsClass extends BaseClass
 		self::updateById($id, ['status' => $status]);
 		GoodsCategoryClass::updateByCondition(['gId' => $id], ['status' => $status]);
 	}
-
+	
 }

biz/order/services/OrderService.php

@@ -4,6 +4,7 @@ namespace biz\order\services;
 
 use biz\base\services\BaseService;
 use biz\merchant\services\MerchantCapitalService;
+use biz\merchant\services\MerchantService;
 use biz\order\classes\OrderClass;
 use biz\order\models\Order;
 use biz\promote\services\CouponRightService;
@@ -43,12 +44,18 @@ class OrderService extends BaseService
 		$orderUserIds = array_unique($orderUserIds);
 		$userInfoList = UserService::getUserByIds($orderUserIds);
 		
+		$merchantIdList = array_column($data['list'], 'merchantId');
+		$merchantIdList = array_filter(array_unique($merchantIdList));
+		$merchantList = MerchantService::getByIds($merchantIdList, null, 'id');
+		
 		foreach ($data['list'] as $key => $val) {
 			$id = $val['id'];
 			$userId = $val['userId'];
 			$data['list'][$key]['goodsInfoList'] = isset($goodsList[$id]) ? $goodsList[$id] : [];
 			//订花人头像
 			$data['list'][$key]['bookAvatar'] = isset($userInfoList[$userId]['avatar']) ? $userInfoList[$userId]['avatar'] : '';
+			$merchantId = $val['merchantId'];
+			$data['list'][$key]['merchantName'] = isset($merchantList[$merchantId]['merchantName']) ? $merchantList[$merchantId]['merchantName'] : '';
 		}
 		return $data;
 	}
@@ -156,7 +163,7 @@ class OrderService extends BaseService
 	{
 		return OrderClass::getOrderById($id);
 	}
-
+	
 	//查看订单详情 shish 2020.1.4
 	public static function getOrderBySn($orderSn)
 	{

biz/user/classes/UserClass.php

@@ -3,6 +3,7 @@
 namespace biz\user\classes;
 
 use biz\merchant\classes\MerchantAssetClass;
+use biz\merchant\services\MerchantService;
 use biz\message\classes\ChatClass;
 use biz\user\services\UserIntegralService;
 use common\components\business;
@@ -50,6 +51,11 @@ class UserClass extends BaseClass
 		$ids = array_column($list, 'id');
 		$ids = array_unique($ids);
 		$asset = UserAssetClass::getByUserIds($ids, 'userId');
+		
+		$merchantIdList = array_column($list, 'merchantId');
+		$merchantIdList = array_filter(array_unique($merchantIdList));
+		$merchantList = MerchantService::getByIds($merchantIdList, null, 'id');
+		
 		foreach ($list as $key => $val) {
 			$userId = $val['id'];
 			//访问时间
@@ -62,6 +68,8 @@ class UserClass extends BaseClass
 			//客户发来新消息数
 			$list[$key]['unReadNum'] = ChatClass::getUnreadNum($userId);
 			$list[$key] = business::formatUserAvatar($list[$key]);
+			$merchantId = $val['merchantId'];
+			$list[$key]['merchantName'] = isset($merchantList[$merchantId]['merchantName']) ? $merchantList[$merchantId]['merchantName'] : '';
 		}
 		return $list;
 	}
@@ -414,7 +422,7 @@ class UserClass extends BaseClass
 		}
 		return true;
 	}
-
+	
 	public static function getUserByIds($ids)
 	{
 		$info = self::getByIds($ids, null, 'id');
@@ -424,5 +432,5 @@ class UserClass extends BaseClass
 		$data = self::groupUserBaseInfo($info);
 		return $data;
 	}
-
+	
 }