Merge branch 'colonel' into 'pre_release'

update 团长分销-增加获取资金池日志

See merge request bp/goods!43

application/modules/Job/controllers/Colonelorder.php

@@ -234,7 +234,7 @@ class ColonelorderController extends Job
         $res = Idgen::get(appConfig('idgen.partner'), appConfig('idgen.key'), [], $httpParams);
         $ids = $res['id_datetime']['goods'] ?? [];
         if ($count > count($ids)) {
-            throw new Exception('请求idgen服务失败，' . ['req' => $httpParams,'res' => $res]);
+            throw new Exception('请求idgen服务失败，' . ['req' => $httpParams, 'res' => $res]);
         }
         foreach ($data as $key => $item) {
             $data[$key]['pay_info_trade_id'] = $ids[$key];
@@ -288,7 +288,7 @@ class ColonelorderController extends Job
         $response = HttpUtil::post($url, $httpParams, 100000, 3);
         $this->loggerInfo("url=$url,request=" . json_encode($httpParams) . ";response=" . json_encode($response));
         if (!isset($response['response']['result']['capital_pool_total'])) {
-            throw new Exception('没有获取到资金池信息');
+            throw new Exception('没有获取到资金池信息,' . ['req' => $httpParams, 'res' => $response]);
         }
         $result = $response['response']['result'];
         $balance = ($result['capital_pool_total'] - $result['capital_pool_lock'] - $result['capital_pool_used']);