Merge branch 'colonel' of https://git.yidian-inc.com:8021/bp/goods into colonel

application/models/marketing/mysql/TakePlace.php

@@ -3,6 +3,7 @@
 namespace App\Models\marketing\mysql;
 
 use Api\PhpUtils\Mysql\MysqlBase;
+use App\Services\marketing\MarketingService;
 
 /**
  * 自提点
@@ -25,7 +26,7 @@ class TakePlace extends MysqlBase
      */
     public static function searchList($params)
     {
-        $lifeAccountId = $params['life_account_id'] ?? 0;
+        $lifeAccountId = $params['life_account_id'] ?? MarketingService::getPublicLifeAccountId();
         $keywords = $params['keywords'] ?? '';
         $offset = $params['offset'] ?? 0;
         $limit = $params['limit'] ?? 20;

application/services/marketing/MarketingService.php

@@ -170,7 +170,9 @@ class MarketingService
             foreach ($lists as &$val) {
                 if($capitalPoolList[$val['capital_pool_id']]) {
                     $val['capital_pool'] = $capitalPoolList[$val['capital_pool_id']];
-
+                    foreach (['capital_pool_total','capital_pool_lock','capital_pool_used'] as $key){
+                        $val['capital_pool'][$key] = sprintf("%0.02f",$val['capital_pool'][$key]/100);
+                    }
                     $poolTotal += $val['capital_pool']['capital_pool_total'];
                     $poolUsed += $val['capital_pool']['capital_pool_used'];
                     $poolLock += $val['capital_pool']['capital_pool_lock'];