pdkj
/
jiqu-library-server
6
0
Fork 0
Code Releases Activity

优化补贴结算备注

release
李静 2022-01-25 10:51:47 +08:00
parent dd6bea4fdc
commit 56d08345e2
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Console/Commands/Dealer/ManageSubsidySettleCommand.php
View File

@ -203,9 +203,9 @@ class ManageSubsidySettleCommand extends Command
'settle_at' => now(), 'settle_at' => now(),
'status' => DealerEarningStatus::Pending, 'status' => DealerEarningStatus::Pending,
'remark' => sprintf( 'remark' => sprintf(
'【%s - %s】%s', "【%s - %s】\n%s",
$subsidy->start_at->format('Y/m/d H:i:s'), $subsidy->start_at->format('Y/m/d'),
$subsidy->end_at->format('Y/m/d H:i:s'), $subsidy->end_at->format('Y/m/d'),
$remark $remark
), ),
]); ]);
@ -242,7 +242,7 @@ class ManageSubsidySettleCommand extends Command
$remark .= "\n"; $remark .= "\n";
} }
$remark .= "【{$subsidyLog->product->name}】销量: {$subsidyLog->sales_volume}, 补贴金额: {$subsidyLog->total_amount}"; $remark .= "【{$subsidyLog->product->name}】\n销量: {$subsidyLog->sales_volume}\n补贴金额: {$subsidyLog->total_amount}";
} }
return [$totalAmount, $remark]; return [$totalAmount, $remark];

9
app/Console/Commands/Dealer/ManagerSubsidySettleCommand.php
View File

@ -178,9 +178,9 @@ class ManagerSubsidySettleCommand extends Command
'settle_at' => now(), 'settle_at' => now(),
'status' => DealerEarningStatus::Pending, 'status' => DealerEarningStatus::Pending,
'remark' => sprintf( 'remark' => sprintf(
'【%s - %s】%s', "【%s - %s】\n%s",
$subsidy->start_at->format('Y/m/d H:i:s'), $subsidy->start_at->format('Y/m/d'),
$subsidy->end_at->format('Y/m/d H:i:s'), $subsidy->end_at->format('Y/m/d'),
$remark $remark
), ),
]); ]);
@ -215,9 +215,8 @@ class ManagerSubsidySettleCommand extends Command
$remark .= "\n"; $remark .= "\n";
} }
$remark .= "【{$salesLog->product->name}】销量: {$salesLog->sales_volume}, 补贴金额: {$amount}"; $remark .= "【{$salesLog->product->name}】\n销量: {$salesLog->sales_volume}\n补贴金额: {$amount}";
} }
return [$totalAmount, $remark]; return [$totalAmount, $remark];
} }

6
app/Console/Commands/Dealer/PurchaseSubsidySettleCommand.php
View File

@ -136,9 +136,9 @@ class PurchaseSubsidySettleCommand extends Command
if (! $purchaseSubsidy->isCompleted()) { if (! $purchaseSubsidy->isCompleted()) {
$remark = sprintf( $remark = sprintf(
'【%s - %s】销售业绩: %s, 补贴比例: %s%%', "【%s - %s】\n销售业绩: %s\n补贴比例: %s%%",
$purchaseSubsidy->start_at->format('Y/m/d H:i:s'), $purchaseSubsidy->start_at->format('Y/m/d'),
$purchaseSubsidy->end_at->format('Y/m/d H:i:s'), $purchaseSubsidy->end_at->format('Y/m/d'),
$purchaseSubsidy->total_purchase_amount, $purchaseSubsidy->total_purchase_amount,
$purchaseSubsidy->subsidy_rate $purchaseSubsidy->subsidy_rate
); );