update 团长分销-团长列表

application/models/marketing/mysql/ColonelDistributorColonelApply.php

@@ -19,7 +19,7 @@ class ColonelDistributorColonelApply extends MysqlBase
     const STATUS_PASS = 1;//审核通过
     const STATUS_REJECT = 2;//审核驳回
 
-    const DEFAULT_COLUMN = ['colonel_apply_id','audit_status','user_id','phone','contact_name','take_place_name','province','city','area','location'];
+    const DEFAULT_COLUMN = ['colonel_apply_id','audit_status','user_id','phone','contact_name','take_place_name','province','city','area','location','address'];
 
     public static function insertRecord(array $column) : int
     {

application/models/marketing/mysql/TakePlace.php

@@ -60,6 +60,11 @@ class TakePlace extends MysqlBase
         return self::get($column, $where);
     }
 
+    public static function getRecords(array $where, $column = '*')
+    {
+        return self::select($column, $where);
+    }
+
     public static function existTakePlaceName(string $takePlaceName) : bool
     {
         $exist = self::getRecord(['take_place_name' => $takePlaceName], ['take_place_id']);

application/services/marketing/ColonelService.php

@@ -124,9 +124,14 @@ class ColonelService
         }
         $userIds = array_column($result['result'], 'user_id');
         $userMap = self::getUserMap($userIds);
+        $takePlaceMap = self::getTakePlaceMap(array_column($result['result'], 'take_place_id'));
         $incomeMap = PindanActivityInviteOrderService::incomeStatistics(["user_ids" => $userIds]);
         foreach ($result['result'] as &$colonelVal) {
             $userId = $colonelVal['user_id'];
+            $takePlaceInfo = !empty($takePlaceMap[$colonelVal['take_place_id']]) ? $takePlaceMap[$colonelVal['take_place_id']] : [];
+            $colonelVal['take_place_name'] = $takePlaceInfo['take_place_name'] ?? '';
+            $colonelVal['location'] = $takePlaceInfo['location'] ?? '';
+            $colonelVal['address']  = $takePlaceInfo['address'] ?? '';
             $colonelVal['user_avatar'] = !empty($userMap[$userId]['user_avatar']) ? $userMap[$userId]['user_avatar'] : '';
             $colonelVal['no_settlement_income'] = !empty($incomeMap[$userId]['no_settlement']) ? $incomeMap[$userId]['no_settlement'] : 0;
             $colonelVal['total_income'] = !empty($incomeMap[$userId]['all_reward']) ? $incomeMap[$userId]['all_reward'] : 0;
@@ -305,4 +310,17 @@ class ColonelService
         $params['page_size'] = !empty($params['page_size']) ? $params['page_size'] : 20;
         return $params;
     }
+
+    /**
+     * Notes: 获取自提点信息
+     * User: pengfei@yidian-inc.com
+     * Date: 2021/9/8 6:16 下午
+     * @param array $takePlaceId
+     * @return array
+     */
+    private static function getTakePlaceMap(array $takePlaceId): array
+    {
+        $takePlaces = TakePlace::getRecords(['take_place_id' => $takePlaceId]);
+        return array_column((array)$takePlaces, null, 'take_place_id');
+    }
 }