From 8840d1a71982defe707faf0e174d0bfc17a9bacb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=BB=BA=E7=82=8A?= <924182103@qq.com>
Date: Fri, 6 Dec 2024 10:23:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=89=A3=E5=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Resources/BusinessOrderResource.php  | 14 +++++++--
 app/Models/BusinessOrder.php                  | 30 -------------------
 app/Services/Business/BusinessClient.php      |  2 +-
 .../Business/KuaiTuanTuan/KuaiTuanTuan.php    |  4 +--
 app/Services/Business/MiaoXuan/MiaoXuan.php   |  2 +-
 5 files changed, 16 insertions(+), 36 deletions(-)

diff --git a/app/Http/Resources/BusinessOrderResource.php b/app/Http/Resources/BusinessOrderResource.php
index 1fa3691..5ebc8dd 100644
--- a/app/Http/Resources/BusinessOrderResource.php
+++ b/app/Http/Resources/BusinessOrderResource.php
@@ -9,11 +9,21 @@ class BusinessOrderResource extends JsonResource
     /**
      * Transform the resource into an array.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param \Illuminate\Http\Request $request
      * @return array
      */
     public function toArray($request)
     {
-        return parent::toArray($request);
+        $data = parent::toArray($request);
+        $data['confirm_at'] = date('Y-m-d H:i:s', $data['confirm_at'] / 1000);
+        $map = ['未发货', '已发货', '部分发货', "已收货", '' => ''];
+        $data['shipping_status'] = $map[$data['shipping_status']] ?? '';
+        $map = ['帮忙团订单', '自卖团订单', '' => ''];
+        $data['is_supplier'] = $map[$data['is_supplier']] ?? '';
+        $map = ['未取消', '已取消', '' => ''];
+        $data['cancel_status'] = $map[$data['cancel_status']] ?? '';
+        $map = ['未发起售后 ', '退款中', '退款成功', '待处理', '拒绝退款', '待(顾客)退货', '待(团长)确认退货', '撤销', '撤销', '(系统)关闭' => ''];
+        $data['after_sales_status'] = $map[$data['after_sales_status']] ?? '';
+        return $data;
     }
 }
diff --git a/app/Models/BusinessOrder.php b/app/Models/BusinessOrder.php
index 1cd6e39..166c9a1 100644
--- a/app/Models/BusinessOrder.php
+++ b/app/Models/BusinessOrder.php
@@ -62,36 +62,6 @@ class BusinessOrder extends Model
         'order_sn',
     ];
 
-    public function getConfirmAtAttribute($value)
-    {
-        return date('Y-m-d H:i:s', $value / 1000);
-    }
-
-    public function getShippingStatusAttribute($value)
-    {
-        $map = ['未发货', '已发货', '部分发货',"已收货", '' => ''];
-
-        return $map[$value];
-    }
-
-    public function getIsSupplierAttribute($value)
-    {
-        $map = ['帮忙团订单', '自卖团订单', '' => ''];
-
-        return $map[$value];
-    }
-
-    public function getCancelStatusAttribute($value)
-    {
-        $map = ['未取消', '已取消', '' => ''];
-
-        return $map[$value];
-    }
-
-    public function getAfterSalesStatusAttribute($value)
-    {
-        return empty($value) ? '未售后' : '有售后';
-    }
 
     public function items()
     {
diff --git a/app/Services/Business/BusinessClient.php b/app/Services/Business/BusinessClient.php
index 14ad115..1cbe5fc 100644
--- a/app/Services/Business/BusinessClient.php
+++ b/app/Services/Business/BusinessClient.php
@@ -161,7 +161,7 @@ abstract class BusinessClient
         if (strlen($paramsJson) > 1024) {
             $paramsJson = '';
         }
-        if (!in_array($params['type'], ['pdd.ktt.increment.order.query', 'pdd.ktt.order.list',"pdd.ktt.after.sales.increment.list"], true)) {
+        if (!in_array($params['type'], ['pdd.ktt.increment.order.query', 'pdd.ktt.order.list',"pdd.ktt.after.sales.increment.list","pdd.ktt.order.get"], true)) {
             $log = new Log();
             $log->module = 'plat';
             $log->action = $method;
diff --git a/app/Services/Business/KuaiTuanTuan/KuaiTuanTuan.php b/app/Services/Business/KuaiTuanTuan/KuaiTuanTuan.php
index 14b5099..d13c07d 100644
--- a/app/Services/Business/KuaiTuanTuan/KuaiTuanTuan.php
+++ b/app/Services/Business/KuaiTuanTuan/KuaiTuanTuan.php
@@ -185,7 +185,6 @@ class KuaiTuanTuan extends BusinessClient
         if (!isset($res[$responseName]['order_info'])) {
             return;
         }
-
         $queryOrder = $res[$responseName]['order_info'];
         $needUpdate = false;
         if ($order->shipping_status != $queryOrder['shipping_status']) {
@@ -196,11 +195,12 @@ class KuaiTuanTuan extends BusinessClient
             $order->cancel_status = $queryOrder['cancel_status'];
             $needUpdate = true;
         }
-        if ($order->after_sales_status!= $queryOrder['cancel_status']) {
+        if ($order->after_sales_status != $queryOrder['after_sales_status']) {
             //售后状态更新
             $order->after_sales_status = $queryOrder['after_sales_status'];
             $needUpdate = true;
         }
+
         if ($needUpdate) {
             $goodsSkuNum = 0;
             foreach ($queryOrder['sub_order_list'] as $item) {
diff --git a/app/Services/Business/MiaoXuan/MiaoXuan.php b/app/Services/Business/MiaoXuan/MiaoXuan.php
index f496eda..b865284 100644
--- a/app/Services/Business/MiaoXuan/MiaoXuan.php
+++ b/app/Services/Business/MiaoXuan/MiaoXuan.php
@@ -54,7 +54,7 @@ class MiaoXuan extends BusinessClient
             $order->cancel_status = $queryOrder['cancel_status'];
             $needUpdate = true;
         }
-        if ($order->after_sales_status!= $queryOrder['cancel_status']) {
+        if ($order->after_sales_status!= $queryOrder['after_sales_status']) {
             //售后状态更新
             $order->after_sales_status = $queryOrder['after_sales_status'];
             $needUpdate = true;