From d77397e21cee36e70f03e4abea721a1da0544245 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Fri, 14 Jul 2023 16:25:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AE=A2=E5=8D=95=E8=AE=A1?=
 =?UTF-8?q?=E6=81=AF=E5=BC=80=E5=A7=8B=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/repositories/store/order/StoreOrderRepository.php | 2 +-
 app/listener/OrderCreate.php                                 | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php
index 65358766..cbe6914c 100644
--- a/app/common/repositories/store/order/StoreOrderRepository.php
+++ b/app/common/repositories/store/order/StoreOrderRepository.php
@@ -732,7 +732,7 @@ class StoreOrderRepository extends BaseRepository
                 app()->make(MerchantRepository::class)->computedLockMoney($order);
             }
             if (!empty($order->interest) && $order->interest->status == StoreOrderInterest::STATUS_UNSETTLED) {
-                $order->interest->start_time = date('Y-m-d H:i:s', strtotime("+{$order['merchant']['settle_cycle']} days"));
+                $order->interest->start_time = date('Y-m-d H:i:s', strtotime("+{$order->interest->settle_cycle} days"));
                 $order->interest->save();
             }
             $order->save();
diff --git a/app/listener/OrderCreate.php b/app/listener/OrderCreate.php
index 4d366778..3d8805b2 100644
--- a/app/listener/OrderCreate.php
+++ b/app/listener/OrderCreate.php
@@ -31,6 +31,7 @@ class OrderCreate
             'to_mer_id' => $order['mer_id'] ?? 0,
             'total_price' => $groupOrder['total_price'],
             'rate' => $order['merchant']['interest_rate'] ?? 0,
+            'settle_cycle' => $order['merchant']['settle_cycle'] ?? 0,
         ];
         return $storeOrderInterestRepository->create($data);
     }