From 261490a6d8db9a66eba3711df0b6678c52d4c9f8 Mon Sep 17 00:00:00 2001
From: nizongfeng <nizongfeng@gmail.com>
Date: Wed, 24 Nov 2021 11:33:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=B0=E5=BD=95=20=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E3=80=81=E5=88=A0=E9=99=A4=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/dao/OrderMainDao.php | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/application/admin/dao/OrderMainDao.php b/application/admin/dao/OrderMainDao.php
index 350c3c2..a64045a 100644
--- a/application/admin/dao/OrderMainDao.php
+++ b/application/admin/dao/OrderMainDao.php
@@ -105,10 +105,27 @@ class OrderMainDao
             if (!$orderInfoRe['flag']) {
                 return $orderInfoRe;
             }
-            $orderStatus = $this->getStatus($cnt,$statusList,$orderInfoRe['data']);
+            $orderInfo = $orderInfoRe['data'];
+            $orderStatus = $this->getStatus($cnt,$statusList,$orderInfo);
+            $saveVal = [
+                "total_amount" => $amount,
+                "cost_amount" => $cost,
+                "profit_amount"=>$amount-$cost,
+                "order_status"=>$orderStatus,
+                "success_time"=>null,
+                "cancel_time"=>null
+                ];
+            if ($orderStatus != $orderInfo["order_status"]) {
+                if ($orderStatus==10) {
+                    $saveVal["success_time"] = date("Y-m-d H:i:s");
+                }
+                if ($orderStatus == 11 ) {
+                    $saveVal['cancel_time'] = date("Y-m-d H:m:s");
+                }
+            }
             //更新金额
             $orderMain = new OrderMain();
-            $orderMain->save(["total_amount" => $amount, "cost_amount" => $cost,"profit_amount"=>$amount-$cost,"order_status"=>$orderStatus],["id" => $orderId]);
+            $orderMain->save($saveVal,["id" => $orderId]);
             return Util::returnArrSu();
         }catch (Exception $e){
             return Util::returnArrEr("更新主表订单金额失败:".$e->getMessage());