mkm/shop-php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调试平台手续费分润

Browse Source
This commit is contained in:
luofei 2023-05-26 10:31:42 +08:00
parent 30aa2e2e98
commit a70a4de2e3
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/common/repositories/store/order/StoreOrderRepository.php
View File

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

1
crmeb/jobs/AutoMarginJob.php
View File

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