From 0a7460e98339e9c71e26e87b64b56fe58285bc39 Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Mon, 27 Dec 2021 15:02:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=94=AE=E5=90=8E=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=8C=E4=BB=A5=E5=8F=8A=E5=BF=AB=E9=80=92100?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=9B=9E=E8=B0=83=E5=9C=B0=E5=9D=80=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Models/AfterSale.php          | 6 ++++++
 app/Services/Kuaidi100Service.php | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/Models/AfterSale.php b/app/Models/AfterSale.php
index 9475ffc2..424b9c47 100644
--- a/app/Models/AfterSale.php
+++ b/app/Models/AfterSale.php
@@ -168,10 +168,16 @@ class AfterSale extends Model
             //如果取消订单
             if ($afterSale->state == self::STATE_CANCEL) {
                 $afterSale->createCancelLog();
+                $afterSale->orderProduct->update([
+                    'after_sale_state'=>0,
+                ]);
             }
             //如果完成订单
             if ($afterSale->state == self::STATE_FINISH) {
                 $afterSale->createFinishLog();
+                $afterSale->orderProduct->update([
+                    'after_sale_state'=>2,
+                ]);
             }
         });
     }
diff --git a/app/Services/Kuaidi100Service.php b/app/Services/Kuaidi100Service.php
index 18cc9b96..be4a0030 100644
--- a/app/Services/Kuaidi100Service.php
+++ b/app/Services/Kuaidi100Service.php
@@ -1344,7 +1344,7 @@ class Kuaidi100Service
     public function poll(string $number, string $code, string $phone)
     {
         $uri = '/poll';
-        $callbackUrl = app_settings('kuaidi100.callback');
+        $callbackUrl = app_settings('kuaidi100.callback_uri');
 
         if (empty($callbackUrl)) {
             throw new BizException('未配置推送回调地址');