Commit 1aac1163 1aac11632d6e7c9e84e3c0ac223ca8106107fb18 by lemon

*

1 parent 6d86a205
...@@ -9,6 +9,7 @@ use App\Models\Legal\Company; ...@@ -9,6 +9,7 @@ use App\Models\Legal\Company;
9 use App\Models\Legal\StakeholderIncomeSyncApp; 9 use App\Models\Legal\StakeholderIncomeSyncApp;
10 use App\Models\Legal\StakeholderIncomeSyncAppDetails; 10 use App\Models\Legal\StakeholderIncomeSyncAppDetails;
11 use App\Models\Legal\StakeholderIncomeSyncAppLogs; 11 use App\Models\Legal\StakeholderIncomeSyncAppLogs;
12 use App\Models\Legal\Subject;
12 use App\Services\ApiService; 13 use App\Services\ApiService;
13 use Illuminate\Console\Command; 14 use Illuminate\Console\Command;
14 use Illuminate\Support\Facades\DB; 15 use Illuminate\Support\Facades\DB;
...@@ -190,8 +191,7 @@ class StakeholderIncomeSyncCommand extends Command ...@@ -190,8 +191,7 @@ class StakeholderIncomeSyncCommand extends Command
190 */ 191 */
191 private function formatHttpBody($income, $income_detail) 192 private function formatHttpBody($income, $income_detail)
192 { 193 {
193 194 $subject = Subject::query()->where(['company_id'=>$income->company_id, 'no'=>$income->subject_no])->first();
194 $company = Company::query()->find($income->company_id);
195 $bills = Bills::query()->find($income->related_id); 195 $bills = Bills::query()->find($income->related_id);
196 196
197 $body = [ 197 $body = [
...@@ -204,7 +204,7 @@ class StakeholderIncomeSyncCommand extends Command ...@@ -204,7 +204,7 @@ class StakeholderIncomeSyncCommand extends Command
204 'totalMoney' => $income->total_money, 204 'totalMoney' => $income->total_money,
205 'type' => self::TYPE_BILLS, 205 'type' => self::TYPE_BILLS,
206 'title' => $this->billsTitle($bills),//账单标题 206 'title' => $this->billsTitle($bills),//账单标题
207 'paymentCompany'=> $company->receipt_name, //付款公司营业执照全称 207 'paymentCompany'=> $subject->receipt_name, //付款公司营业执照全称
208 'addLevelTwoIncomeRequests' => [], 208 'addLevelTwoIncomeRequests' => [],
209 ]; 209 ];
210 210
...@@ -215,7 +215,7 @@ class StakeholderIncomeSyncCommand extends Command ...@@ -215,7 +215,7 @@ class StakeholderIncomeSyncCommand extends Command
215 'faxMoney' => $item->fax_money, 215 'faxMoney' => $item->fax_money,
216 'money' => $item->money, 216 'money' => $item->money,
217 'totalMoney' => $item->total_money, 217 'totalMoney' => $item->total_money,
218 'paymentCompany' => $company->receipt_name, //付款公司营业执照全称 218 'paymentCompany' => $subject->receipt_name, //付款公司营业执照全称
219 'songNum' => $item->song_num, 219 'songNum' => $item->song_num,
220 'title' => $this->billsSubTitle($item->month), 220 'title' => $this->billsSubTitle($item->month),
221 'type' => self::TYPE_BILLS, 221 'type' => self::TYPE_BILLS,
......