Skip to content

G
goods
Commit 4b6d4765 authored by pengfei's avatar pengfei
Browse files
Options

update ColonelService style

parent 5dd6ac85
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 21 deletions
application/services/marketing/ColonelService.php
View file @ 4b6d4765
...@@ -30,19 +30,19 @@ class ColonelService ...@@ -30,19 +30,19 @@ class ColonelService
throw new MarketingException(MarketingException::COLONEL_APPLY_EXIST); throw new MarketingException(MarketingException::COLONEL_APPLY_EXIST);
} }
$colonelData = [ $colonelData = [
'user_id' => $params['user_id'], 'user_id' => $params['user_id'],
'life_account_id' => MarketingService::getPublicLifeAccountId(), 'life_account_id' => MarketingService::getPublicLifeAccountId(),
'phone' => $params['phone'], 'phone' => $params['phone'],
'contact_name' => $params['contact_name'], 'contact_name' => $params['contact_name'],
'take_place_name' => $params['take_place_name'], 'take_place_name' => $params['take_place_name'],
'take_place_pic' => $params['take_place_pic'] ?? '', 'take_place_pic' => $params['take_place_pic'] ?? '',
'longitude' => $params['longitude'] ?? 0, 'longitude' => $params['longitude'] ?? 0,
'latitude' => $params['latitude'] ?? 0, 'latitude' => $params['latitude'] ?? 0,
'location' => $params['location'] ?? '', 'location' => $params['location'] ?? '',
'address' => $params['address'] ?? '', 'address' => $params['address'] ?? '',
'province' => $params['province'] ?? '', 'province' => $params['province'] ?? '',
'city' => $params['city'] ?? '', 'city' => $params['city'] ?? '',
'area' => $params['area'] ?? '', 'area' => $params['area'] ?? '',
]; ];
try { try {
if (!empty($colonelData['take_place_name'])) { if (!empty($colonelData['take_place_name'])) {
...@@ -88,7 +88,7 @@ class ColonelService ...@@ -88,7 +88,7 @@ class ColonelService
if (empty($result['count'])) { if (empty($result['count'])) {
return $result; return $result;
} }
$userMap = self::getUserMap(array_column($result['result'], 'user_id')); $userMap = self::getUserMap(array_column($result['result'], 'user_id'));
$takePlaceMap = self::getColonelTakePlaceMap(array_column($result['result'], 'colonel_apply_id')); $takePlaceMap = self::getColonelTakePlaceMap(array_column($result['result'], 'colonel_apply_id'));
foreach ($result['result'] as &$applyVal) { foreach ($result['result'] as &$applyVal) {
$applyVal['user_avatar'] = !empty($userMap[$applyVal['user_id']]['user_avatar']) ? $userMap[$applyVal['user_id']]['user_avatar'] : ''; $applyVal['user_avatar'] = !empty($userMap[$applyVal['user_id']]['user_avatar']) ? $userMap[$applyVal['user_id']]['user_avatar'] : '';
...@@ -124,9 +124,9 @@ class ColonelService ...@@ -124,9 +124,9 @@ class ColonelService
$incomeMap = PindanActivityInviteOrderService::incomeStatistics(["user_ids" => $userIds]); $incomeMap = PindanActivityInviteOrderService::incomeStatistics(["user_ids" => $userIds]);
foreach ($result['result'] as &$colonelVal) { foreach ($result['result'] as &$colonelVal) {
$userId = $colonelVal['user_id']; $userId = $colonelVal['user_id'];
$colonelVal['user_avatar'] = !empty($userMap[$userId]['user_avatar']) ? $userMap[$userId]['user_avatar'] : ''; $colonelVal['user_avatar'] = !empty($userMap[$userId]['user_avatar']) ? $userMap[$userId]['user_avatar'] : '';
$colonelVal['yesterday_income'] = !empty($incomeMap[$userId]['yesterday_reward']) ? $incomeMap[$userId]['yesterday_reward'] : 0; $colonelVal['yesterday_income'] = !empty($incomeMap[$userId]['yesterday_reward']) ? $incomeMap[$userId]['yesterday_reward'] : 0;
$colonelVal['total_income'] = !empty($incomeMap[$userId]['all_reward']) ? $incomeMap[$userId]['all_reward'] : 0; $colonelVal['total_income'] = !empty($incomeMap[$userId]['all_reward']) ? $incomeMap[$userId]['all_reward'] : 0;
} }
unset($colonelVal); unset($colonelVal);
return $result; return $result;
...@@ -245,13 +245,13 @@ class ColonelService ...@@ -245,13 +245,13 @@ class ColonelService
{ {
// 入库团长表 // 入库团长表
$colonelData = [ $colonelData = [
'user_id' => $applyInfo['user_id'], 'user_id' => $applyInfo['user_id'],
'colonel_apply_id' => $applyInfo['colonel_apply_id'], 'colonel_apply_id' => $applyInfo['colonel_apply_id'],
'take_place_id' => 0, 'take_place_id' => 0,
'life_account_id' => $applyInfo['life_account_id'], 'life_account_id' => $applyInfo['life_account_id'],
'phone' => $applyInfo['phone'], 'phone' => $applyInfo['phone'],
'contact_name' => $applyInfo['contact_name'], 'contact_name' => $applyInfo['contact_name'],
'colonel_source' => ColonelDistributorColonel::COLONEL_SOURCE_APPLY 'colonel_source' => ColonelDistributorColonel::COLONEL_SOURCE_APPLY
]; ];
return ColonelDistributorColonel::insertRecord($colonelData); return ColonelDistributorColonel::insertRecord($colonelData);
} }
...@@ -291,7 +291,7 @@ class ColonelService ...@@ -291,7 +291,7 @@ class ColonelService
*/ */
private static function getPageParams(array $params = []): array private static function getPageParams(array $params = []): array
{ {
$params['page'] = !empty($params['page']) ? $params['page'] : 1; $params['page'] = !empty($params['page']) ? $params['page'] : 1;
$params['page_size'] = !empty($params['page_size']) ? $params['page_size'] : 20; $params['page_size'] = !empty($params['page_size']) ? $params['page_size'] : 20;
return $params; return $params;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment