Merge branch 'hotfix/shift-player' of wmtx/platform into release

还原补链限制
5 years ago · e6d4304d74
parent 61e9fb6c7b 8ab02a5e0b
commit e6d4304d74
1 changed files with 2 additions and 2 deletions
--- 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']);