调试平台手续费分润

app/common/repositories/store/order/StoreOrderRepository.php

@@ -350,6 +350,7 @@ class StoreOrderRepository extends BaseRepository
                         /** @var MerchantRepository $merchantRepo */
                         $merchantRepo = app()->make(MerchantRepository::class);
                         $merchantRepo->merId = $order->mer_id;
+                        $merchantRepo->forceMargin = false;
                         [$_payPrice, $finance] = $merchantRepo->autoMargin($_payPrice, $order, $finance, $financeSn, $i++);
                     }
                     $finance[] = [

crmeb/jobs/AutoMarginJob.php

@@ -53,6 +53,7 @@ class AutoMarginJob implements JobInterface
             $merchant->ot_margin = $merchant->paid_margin;
             $merchant->is_margin = MerchantRepository::PaidMargin;
             $merchant->save();
+            $job->delete();
         } catch (\Exception $exception) {
             Log::info('更新商户保证金出错：' . var_export($exception, 1));
         } finally {