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']); diff --git a/Application/Base/Service/PromoteService.class.php b/Application/Base/Service/PromoteService.class.php index 06cf3c2f4..a840279b3 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,