From 8ab02a5e0b0ed5cf63aafe6e43daa43cf9cabe44 Mon Sep 17 00:00:00 2001
From: ELF <360197197@qq.com>
Date: Thu, 2 Jan 2020 10:37:10 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E8=A1=A5=E9=93=BE?=
 =?UTF-8?q?=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 a24aa2418..0397a1dd4 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']);

From fb64d574cb34f125621ffd86d87b47e4d74b326d Mon Sep 17 00:00:00 2001
From: ELF <360197197@qq.com>
Date: Mon, 6 Jan 2020 17:47:06 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=85=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BDbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Home/Controller/PackageController.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Application/Home/Controller/PackageController.class.php b/Application/Home/Controller/PackageController.class.php
index 830606409..09f329745 100644
--- a/Application/Home/Controller/PackageController.class.php
+++ b/Application/Home/Controller/PackageController.class.php
@@ -85,7 +85,7 @@ class PackageController extends Controller
 
     private function gotoPkgUrl($packageUrl)
     {
-        if (preg_match("/oss/", $packageUrl)) {
+        if (preg_match("/http/", $packageUrl)) {
             $url = str_replace('-internal', '', $packageUrl);
             echo "<script>window.location.href='$url';</script>";
         } elseif (preg_match("/clouddn/", $packageUrl)) {