From fe55de4aaf28db39cd9713ad56d49bac06d8f8ac Mon Sep 17 00:00:00 2001
From: ELF <360197197@qq.com>
Date: Wed, 21 Oct 2020 20:57:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/PaymentMerchantController.class.php   | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Application/Admin/Controller/PaymentMerchantController.class.php b/Application/Admin/Controller/PaymentMerchantController.class.php
index 5e89bcb4c..8ad732dad 100644
--- a/Application/Admin/Controller/PaymentMerchantController.class.php
+++ b/Application/Admin/Controller/PaymentMerchantController.class.php
@@ -675,6 +675,13 @@ class PaymentMerchantController extends ThinkController
             ]);
         }
 
+        if ($rule['start_time'] < strtotime(date('Y-m-d 23:59:59', time()))) {
+            $this->ajaxReturn([
+                'status' => 0,
+                'message' => '该记录不可删除，规则开始时间包含今天或今天之前的时间。'
+            ]);
+        }
+
         M('payment_rule', 'tab_')->where(['id' => $id])->delete();
         addOperationLog([
             'op_type' => 2,