同步分贝

@@ -3,13 +3,17 @@
 namespace App\Console\Commands;
 namespace App\Console\Commands;
 
 
 use App\Helper\CacheKeyTools;
 use App\Helper\CacheKeyTools;
+use App\Helper\ErrorCode;
 use App\Helper\RedisClient;
 use App\Helper\RedisClient;
+use App\Helper\Response;
 use App\Models\Legal\Bills;
 use App\Models\Legal\Bills;
 use App\Models\Legal\Company;
 use App\Models\Legal\Company;
 use App\Models\Legal\StakeholderIncomeSyncApp;
 use App\Models\Legal\StakeholderIncomeSyncApp;
 use App\Models\Legal\StakeholderIncomeSyncAppDetails;
 use App\Models\Legal\StakeholderIncomeSyncAppDetails;
+use App\Models\Legal\StakeholderIncomeSyncAppLogs;
 use App\Services\ApiService;
 use App\Services\ApiService;
 use Illuminate\Console\Command;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Log;
 
 
 /**
 /**
@@ -40,7 +44,6 @@ class StakeholderIncomeSyncCommand extends Command
     const BLOCK_TIME = 1000;
     const BLOCK_TIME = 1000;
 
 
     const TYPE_BILLS = "1001601"; //账单分成
     const TYPE_BILLS = "1001601"; //账单分成
-    const TYPE_ROYALTY = "1001602"; //合作伙伴打款 type = 1 版税分成
 
 
     /**
     /**
      * Create a new command instance.
      * Create a new command instance.
@@ -79,24 +82,55 @@ class StakeholderIncomeSyncCommand extends Command
                     //http
                     //http
                     $http_res = ApiService::walletAddIncome($http_data);
                     $http_res = ApiService::walletAddIncome($http_data);
 
 
-                    if (empty($http_res)) {
-                        //重试 401/403/403
-                        Log::channel('api')->warning(__METHOD__."streamid:{$id}-api请求失败", ['income_item'=>$income_item, 'http_data'=>$http_data]);
-                    } else {
-                        //成功
+                    Log::channel('api')->info(__METHOD__."同步反馈", ['stream-id'=>$id, 'serial_no'=>$serial_no, 'request'=>$http_data, 'response'=>$http_res]);
 
 
-                    }
+                    //处理返回体
+                    $this->dealResponse($serial_no, $http_data, $http_res);
 
 
                 } else {
                 } else {
                     Log::channel('api')->info(__METHOD__, ['msg'=>'找不到需要同步的对应的收益记录', 'serial_no'=>$serial_no]);
                     Log::channel('api')->info(__METHOD__, ['msg'=>'找不到需要同步的对应的收益记录', 'serial_no'=>$serial_no]);
-                    $this->consumeTask($redis, $key, $id);
                 }
                 }
 
 
+                $this->consumeTask($redis, $key, $id);
             }
             }
         }
         }
     }
     }
 
 
     /**
     /**
+     * 处理返回体
+     * @param $serial_no
+     * @param $http_res
+     */
+    private function dealResponse($serial_no, $request, $response)
+    {
+        DB::beginTransaction();
+
+        try {
+
+            StakeholderIncomeSyncAppLogs::query()->create([
+                'serial_no'     =>  $serial_no,
+                'request_log'   =>  $request,
+                'response_log'  =>  $response
+            ]);
+
+            if (!empty($response) && ($response['code'] == 0)) {
+                StakeholderIncomeSyncApp::query()->where(['serial_no'=>$serial_no])->update([
+                    'busi_id'     =>    $response['id'],
+                    'sync_status' =>    1,
+                ]);
+            }
+
+            DB::commit();
+
+        } catch (\Exception $e) {
+            DB::rollBack();
+            Log::channel('api')->error(__METHOD__, ['msg'=>$e->getMessage(), 'request'=>$request, 'response'=>$response]);
+        }
+
+
+    }
+
+    /**
      * 消费任务
      * 消费任务
      * @param $redis
      * @param $redis
      * @param $key
      * @param $key
@@ -153,7 +187,7 @@ class StakeholderIncomeSyncCommand extends Command
 
 
         foreach ($income_detail as $item) {
         foreach ($income_detail as $item) {
             $body['addLevelTwoIncomeRequests'][] = [
             $body['addLevelTwoIncomeRequests'][] = [
-                'actualTime' => (string)$item->created_at,
+                'actualTime' => $item->created_at,
                 'busiId'     => $item->serial_no,
                 'busiId'     => $item->serial_no,
                 'faxMoney'   => $item->fax_money,
                 'faxMoney'   => $item->fax_money,
                 'money'      => $item->money,
                 'money'      => $item->money,

+<?php
+
+namespace App\Models\Legal;
+
+use App\Models\BaseModel;
+use Illuminate\Support\Facades\DB;
+
+/**
+ * Class stakeholderIncomeSyncApp
+ * @package App\Models
+ */
+class StakeholderIncomeSyncAppLogs extends BaseModel
+{
+
+    /**
+     * @var string
+     */
+    protected $table = 'stakeholder_income_sync_app_logs';
+
+    /**
+     * @var array
+     */
+    protected $guarded = [];
+
+    protected $casts = [
+        'request_log'  =>   'json',
+        'response_log' =>   'json',
+    ];
+
+}