|
@@ -140,13 +140,23 @@ class GhsClass extends BaseClass
|
|
|
if (empty($list)) {
|
|
if (empty($list)) {
|
|
|
return $list;
|
|
return $list;
|
|
|
}
|
|
}
|
|
|
- $prefix = imgUtil::getPrefix();
|
|
|
|
|
|
|
+
|
|
|
|
|
+ $shopIds = array_column($list, 'shopId');
|
|
|
|
|
+ $shopData = ShopClass::getByIds($shopIds, null, 'id');
|
|
|
|
|
+
|
|
|
foreach ($list as $key => $val) {
|
|
foreach ($list as $key => $val) {
|
|
|
- $avatar = $prefix . 'hhb_small.png';
|
|
|
|
|
- if (!empty($val['avatar'])) {
|
|
|
|
|
- $avatar = $prefix . $val['avatar'];
|
|
|
|
|
- }
|
|
|
|
|
- $list[$key]['avatar'] = $avatar;
|
|
|
|
|
|
|
+ $avatar = $val['avatar'] ?? '';
|
|
|
|
|
+ $list[$key]['avatar'] = imgUtil::groupImg($avatar);
|
|
|
|
|
+ $currentShopId = $val['shopId'] ?? 0;
|
|
|
|
|
+ //新人福利和推荐福利
|
|
|
|
|
+ $xrFl = $shopData[$currentShopId]['xrFl'] ?? 0;
|
|
|
|
|
+ $xrFlAmount = $shopData[$currentShopId]['xrFlAmount'] ?? 0;
|
|
|
|
|
+ $tjFl = $shopData[$currentShopId]['tjFl'] ?? 0;
|
|
|
|
|
+ $tjFlAmount = $shopData[$currentShopId]['tjFlAmount'] ?? 0;
|
|
|
|
|
+ $list[$key]['xrFl'] = $xrFl;
|
|
|
|
|
+ $list[$key]['xrFlAmount'] = $xrFlAmount;
|
|
|
|
|
+ $list[$key]['tjFl'] = $tjFl;
|
|
|
|
|
+ $list[$key]['tjFlAmount'] = $tjFlAmount;
|
|
|
}
|
|
}
|
|
|
return $list;
|
|
return $list;
|
|
|
}
|
|
}
|