From d706b144560cb60094f52a45cbf3ab4874b9cd26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=9D=99?= <lym125@gmail.com>
Date: Fri, 25 Feb 2022 16:28:32 +0800
Subject: [PATCH] Update

---
 .../Distribution/PreIncomeJobCommand.php      | 28 ++++++++--------
 .../Distribution/PreIncomeSettleCommand.php   | 32 +++++++++----------
 2 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/app/Console/Commands/Distribution/PreIncomeJobCommand.php b/app/Console/Commands/Distribution/PreIncomeJobCommand.php
index d65d01db..9cabe193 100644
--- a/app/Console/Commands/Distribution/PreIncomeJobCommand.php
+++ b/app/Console/Commands/Distribution/PreIncomeJobCommand.php
@@ -55,20 +55,22 @@ class PreIncomeJobCommand extends Command
                     //发送商家端预收益进帐消息
                     try {
                         DB::beginTransaction();
+
                         switch (get_class($job->jobable)) {
-                        case Order::class://如果是订单类型，则发送预收益消息
-                            $order = $job->jobable;
-                            $incomesLogs = DistributionPreIncome::where('order_id', $order->id)->get();
-                            foreach ($incomesLogs as $log) {
-                                MerchantMessage::createDistributionMessage($log->user_id, [
-                                    'title'=>'恭喜收入'.$log->total_revenue.'元',
-                                    'content'=>'您有新的预收益产生，共'.$log->total_revenue.'元。',
-                                ]);
-                            }
-                            break;
-                        default:
-                            break;
-                    }
+                            case Order::class://如果是订单类型，则发送预收益消息
+                                $order = $job->jobable;
+                                $incomesLogs = DistributionPreIncome::where('order_id', $order->id)->get();
+                                foreach ($incomesLogs as $log) {
+                                    MerchantMessage::createDistributionMessage($log->user_id, [
+                                        'title'=>'恭喜收入'.$log->total_revenue.'元',
+                                        'content'=>'您有新的预收益产生，共'.$log->total_revenue.'元。',
+                                    ]);
+                                }
+                                break;
+                            default:
+                                break;
+                        }
+
                         DB::commit();
                     } catch (Throwable $e) {
                         DB::rollBack();
diff --git a/app/Console/Commands/Distribution/PreIncomeSettleCommand.php b/app/Console/Commands/Distribution/PreIncomeSettleCommand.php
index e456ad83..c8166a91 100644
--- a/app/Console/Commands/Distribution/PreIncomeSettleCommand.php
+++ b/app/Console/Commands/Distribution/PreIncomeSettleCommand.php
@@ -44,33 +44,33 @@ class PreIncomeSettleCommand extends Command
                         DB::beginTransaction();
 
                         $walletService->changeBalance(
-                        $preIncome->user,
-                        bcmul($preIncome->total_revenue, 100),
-                        WalletLog::ACTION_DISTRIBUTION_PRE_INCOME,
-                        $preIncome->remarks,
-                        $preIncome
-                    );
+                            $preIncome->user,
+                            bcmul($preIncome->total_revenue, 100),
+                            WalletLog::ACTION_DISTRIBUTION_PRE_INCOME,
+                            $preIncome->remarks,
+                            $preIncome
+                        );
 
                         // 计算配额
                         $changeQuota = bcmul($preIncome->total_revenue, app_settings('distribution.quota_v2_rate', 0), 4);
                         $changeQuota = round($changeQuota, 3);
 
                         $preIncome->user->userInfo()->update([
-                        'quota_v2' => DB::raw("quota_v2+{$changeQuota}"),
-                    ]);
+                            'quota_v2' => DB::raw("quota_v2+{$changeQuota}"),
+                        ]);
 
                         $preIncome->user->quotaLogs()->create([
-                        'loggable_id' => $preIncome->id,
-                        'loggable_type' => $preIncome->getMorphClass(),
-                        'change_quota' => $changeQuota,
-                        'remarks' => $preIncome->type_text.'得配额',
-                    ]);
+                            'loggable_id' => $preIncome->id,
+                            'loggable_type' => $preIncome->getMorphClass(),
+                            'change_quota' => $changeQuota,
+                            'remarks' => $preIncome->type_text.'得配额',
+                        ]);
 
                         // 将预收益标记为已结算
                         $preIncome->update([
-                        'completed_at' => now(),
-                        'status' => DistributionPreIncome::STATUS_PROCESSED,
-                    ]);
+                            'completed_at' => now(),
+                            'status' => DistributionPreIncome::STATUS_PROCESSED,
+                        ]);
 
                         DB::commit();
                     } catch (Throwable $e) {