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

调整内容

release
vine_liutk 2022-01-19 14:52:16 +08:00 committed by 李静
parent 5653a0869b
commit 182bb11bfd
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Admin/Forms/AfterSaleVerify.php
View File

@ -44,6 +44,7 @@ class AfterSaleVerify extends Form implements LazyRenderable
if ($input['state'] == 3) {//审核通过 if ($input['state'] == 3) {//审核通过
$amount = Arr::get($input, 'amount', 0); $amount = Arr::get($input, 'amount', 0);
$afterSale->load(['order', 'order.afterSales']); $afterSale->load(['order', 'order.afterSales']);
//已完成的售后单
$finishedAfterSale = $afterSale->order->afterSales->filter(function ($items) { $finishedAfterSale = $afterSale->order->afterSales->filter(function ($items) {
if ($items->state == AfterSale::STATE_FINISH && in_array($items->type, [AfterSale::TYPE_REFUND_AND_RETURN, AfterSale::TYPE_REFUND, Aftersale::TYPE_CHANGE])) { if ($items->state == AfterSale::STATE_FINISH && in_array($items->type, [AfterSale::TYPE_REFUND_AND_RETURN, AfterSale::TYPE_REFUND, Aftersale::TYPE_CHANGE])) {
return true; return true;

2
app/Models/DealerEarning.php
View File

@ -124,7 +124,7 @@ class DealerEarning extends Model
public function getStatusNameAttribute() public function getStatusNameAttribute()
{ {
if ($this->settle_at) { if ($this->settle_at) {
return $this->status::text(); return $this->status->text();
} else { } else {
return '待结算'; return '待结算';
} }