From 1b3cf897f1fa11b0525fee62c8b148032ee4736e Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Tue, 28 Dec 2021 09:58:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=94=AE=E5=90=8E=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E5=8F=91=E8=B5=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Controllers/OrderController.php | 5 ++++-
 app/Models/OrderProduct.php               | 4 ++--
 app/Services/AfterSaleService.php         | 4 +++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/Admin/Controllers/OrderController.php b/app/Admin/Controllers/OrderController.php
index 9226e6c9..94415db6 100644
--- a/app/Admin/Controllers/OrderController.php
+++ b/app/Admin/Controllers/OrderController.php
@@ -273,7 +273,10 @@ class OrderController extends AdminController
                         OrderPackage::STATUS_DISTRIBUTE=>'primary',
                         OrderPackage::STATUS_QUESTION  =>'warning',
                     ]);
-                    $grid->column('is_failed', '作废')->bool();
+                    $grid->column('is_failed', '正常')->bool([
+                        0=>true,
+                        1=>false,
+                    ]);
                     $grid->model()->orderBy('created_at', 'desc');
 
                     $grid->disableActions();
diff --git a/app/Models/OrderProduct.php b/app/Models/OrderProduct.php
index 0c4c0cae..93a5630d 100644
--- a/app/Models/OrderProduct.php
+++ b/app/Models/OrderProduct.php
@@ -101,9 +101,9 @@ class OrderProduct extends Model
         $res = false;
 
         //老判断，有过期时间，且未到过期时间，未发起过售后
-        // $oldJudge = !is_null($this->after_expire_at) && $this->after_expire_at < now() &&  $this->after_sale_state == 0;
+        // $oldJudge = !is_null($this->after_expire_at) && $this->after_expire_at > now() &&  $this->after_sale_state == 0;
 
-        //新判断, 有发货单，有过期期时间需要判断未过到过期时间， 未发起过售后；
+        //新判断, 有发货单，在售后时间范围内， 未发起过售后；
         if ($this->packages()->where('is_failed', false)->count() >0) {
             if ((is_null($this->after_expire_at) || $this->after_expire_at > now()) && $this->after_sale_state == 0) {
                 $res = true;
diff --git a/app/Services/AfterSaleService.php b/app/Services/AfterSaleService.php
index 27e39c37..ff71ddc7 100644
--- a/app/Services/AfterSaleService.php
+++ b/app/Services/AfterSaleService.php
@@ -56,7 +56,9 @@ class AfterSaleService
             'state'     => AfterSale::STATE_VERIFY,
         ]));
 
-        $orderProduct->after_sale_state = 1;
+        $orderProduct->update([
+            'after_sale_state'=>1,
+        ]);
 
         return $afterSale;
     }