diff --git a/app/Console/Commands/Dealer/ManageSubsidySettleCommand.php b/app/Console/Commands/Dealer/ManageSubsidySettleCommand.php index 06ec3431..795460f0 100644 --- a/app/Console/Commands/Dealer/ManageSubsidySettleCommand.php +++ b/app/Console/Commands/Dealer/ManageSubsidySettleCommand.php @@ -203,9 +203,9 @@ class ManageSubsidySettleCommand extends Command 'settle_at' => now(), 'status' => DealerEarningStatus::Pending, 'remark' => sprintf( - '【%s - %s】%s', - $subsidy->start_at->format('Y/m/d H:i:s'), - $subsidy->end_at->format('Y/m/d H:i:s'), + "【%s - %s】\n%s", + $subsidy->start_at->format('Y/m/d'), + $subsidy->end_at->format('Y/m/d'), $remark ), ]); @@ -242,7 +242,7 @@ class ManageSubsidySettleCommand extends Command $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]; diff --git a/app/Console/Commands/Dealer/ManagerSubsidySettleCommand.php b/app/Console/Commands/Dealer/ManagerSubsidySettleCommand.php index 722fb074..60a8a28a 100644 --- a/app/Console/Commands/Dealer/ManagerSubsidySettleCommand.php +++ b/app/Console/Commands/Dealer/ManagerSubsidySettleCommand.php @@ -178,9 +178,9 @@ class ManagerSubsidySettleCommand extends Command 'settle_at' => now(), 'status' => DealerEarningStatus::Pending, 'remark' => sprintf( - '【%s - %s】%s', - $subsidy->start_at->format('Y/m/d H:i:s'), - $subsidy->end_at->format('Y/m/d H:i:s'), + "【%s - %s】\n%s", + $subsidy->start_at->format('Y/m/d'), + $subsidy->end_at->format('Y/m/d'), $remark ), ]); @@ -215,9 +215,8 @@ class ManagerSubsidySettleCommand extends Command $remark .= "\n"; } - $remark .= "【{$salesLog->product->name}】销量: {$salesLog->sales_volume}, 补贴金额: {$amount}"; + $remark .= "【{$salesLog->product->name}】\n销量: {$salesLog->sales_volume}\n补贴金额: {$amount}"; } - return [$totalAmount, $remark]; } diff --git a/app/Console/Commands/Dealer/PurchaseSubsidySettleCommand.php b/app/Console/Commands/Dealer/PurchaseSubsidySettleCommand.php index 7e309aa3..b6ff2768 100644 --- a/app/Console/Commands/Dealer/PurchaseSubsidySettleCommand.php +++ b/app/Console/Commands/Dealer/PurchaseSubsidySettleCommand.php @@ -136,9 +136,9 @@ class PurchaseSubsidySettleCommand extends Command if (! $purchaseSubsidy->isCompleted()) { $remark = sprintf( - '【%s - %s】销售业绩: %s, 补贴比例: %s%%', - $purchaseSubsidy->start_at->format('Y/m/d H:i:s'), - $purchaseSubsidy->end_at->format('Y/m/d H:i:s'), + "【%s - %s】\n销售业绩: %s\n补贴比例: %s%%", + $purchaseSubsidy->start_at->format('Y/m/d'), + $purchaseSubsidy->end_at->format('Y/m/d'), $purchaseSubsidy->total_purchase_amount, $purchaseSubsidy->subsidy_rate );