From e59a2f735096eb9e26a579b01b510e84aee7af06 Mon Sep 17 00:00:00 2001
From: "elf@home" <360197197@qq.com>
Date: Wed, 1 Jan 2020 16:18:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=8E=A9=E5=AE=B6?=
 =?UTF-8?q?=E8=BF=81=E7=A7=BB=E5=8F=AA=E5=AF=B9=E5=90=8C=E4=B8=80=E6=8E=A8?=
 =?UTF-8?q?=E5=B9=BF=E5=91=98=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Base/Service/PromoteService.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Application/Base/Service/PromoteService.class.php b/Application/Base/Service/PromoteService.class.php
index d1ba9e5d1..205abadbb 100644
--- a/Application/Base/Service/PromoteService.class.php
+++ b/Application/Base/Service/PromoteService.class.php
@@ -123,7 +123,7 @@ class PromoteService {
             ];
         }
 
-        $shiftTask = M('shift_task', 'sys_')->field(['id'])->where(['type' => $type, 'status' => 0, 'from_promote_id'])->find();
+        $shiftTask = M('shift_task', 'sys_')->field(['id'])->where(['type' => $type, 'status' => 0, 'from_promote_id' => $fromPromoteId])->find();
         if ($shiftTask) {
             return [
                 'status' => false, 

From 0bc50cbf70449edfd31b6a7c273f23b125489137 Mon Sep 17 00:00:00 2001
From: "elf@home" <360197197@qq.com>
Date: Wed, 1 Jan 2020 21:22:49 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/MendController.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Application/Admin/Controller/MendController.class.php b/Application/Admin/Controller/MendController.class.php
index 0397a1dd4..a24aa2418 100644
--- a/Application/Admin/Controller/MendController.class.php
+++ b/Application/Admin/Controller/MendController.class.php
@@ -123,9 +123,9 @@ class MendController extends ThinkController {
             if(self::checkSettlement(strtotime($_POST['order_time']),$_POST['promote_id'])){
                 $this->error('在订单日期内含有已经结算的订单，无法补链');
             }
-            if(self::checkPromote(strtotime($_POST['order_time']),$_POST['account'])){
+            /* if(self::checkPromote(strtotime($_POST['order_time']),$_POST['account'])){
                 $this->error('在订单日期内含有多个推广员，无法补链');
-            }
+            } */
             
             $create = $_REQUEST;
             $create['order_time'] = date($create['order_time']);