From 8a3c5f0cce766b3a1ff811c198e71304ca38b803 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Thu, 24 Nov 2022 11:55:39 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=A8=8B=E5=BA=8F=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E3=80=91=E6=8B=86=E5=8D=95=E5=92=8C=E9=80=80=E6=AC=BE=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/model/order/StoreOrder.php                  | 3 ++-
 crmeb/app/services/order/StoreOrderRefundServices.php | 3 ---
 crmeb/app/services/order/StoreOrderSplitServices.php  | 1 -
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/crmeb/app/model/order/StoreOrder.php b/crmeb/app/model/order/StoreOrder.php
index 7a724431a..6e8cbbf96 100644
--- a/crmeb/app/model/order/StoreOrder.php
+++ b/crmeb/app/model/order/StoreOrder.php
@@ -63,8 +63,9 @@ class StoreOrder extends BaseModel
      * 创建时间修改器
      * @return int
      */
-    protected function setAddTimeAttr()
+    protected function setAddTimeAttr($time = 0)
     {
+        if ($time) return $time;
         return time();
     }
 
diff --git a/crmeb/app/services/order/StoreOrderRefundServices.php b/crmeb/app/services/order/StoreOrderRefundServices.php
index da371378b..7c8115bbe 100644
--- a/crmeb/app/services/order/StoreOrderRefundServices.php
+++ b/crmeb/app/services/order/StoreOrderRefundServices.php
@@ -200,9 +200,6 @@ class StoreOrderRefundServices extends BaseServices
                         if ($refundOrder['is_channel'] == 1) {
                             $refundData['trade_no'] = $refundOrder['trade_no'];
                             $refundData['pay_new_weixin_open'] = sys_config('pay_new_weixin_open');
-                            /** @var StoreOrderCreateServices $storeOrderCreateServices */
-                            $storeOrderCreateServices = app()->make(StoreOrderCreateServices::class);
-                            $refundData['refund_no'] = $refundData['refund_no'];
                             //小程序退款
                             $pay->refund($no, $refundData);//小程序
                         } else {
diff --git a/crmeb/app/services/order/StoreOrderSplitServices.php b/crmeb/app/services/order/StoreOrderSplitServices.php
index d2fa6c2bc..969b0033c 100644
--- a/crmeb/app/services/order/StoreOrderSplitServices.php
+++ b/crmeb/app/services/order/StoreOrderSplitServices.php
@@ -98,7 +98,6 @@ class StoreOrderSplitServices extends BaseServices
                     $order_data['order_id'] = $storeOrderCreateServices->getNewOrderId('cp');
                     $order_data['cart_id'] = [];
                     $order_data['unique'] = $storeOrderCreateServices->getNewOrderId('');
-                    $order_data['add_time'] = time();
                     $new_order = $this->dao->save($order_data);
                     if (!$new_order) {
                         throw new AdminException(400544);