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

修改玩家迁移限制
master
廖金灵 5 years ago committed by Gogs
commit b12b133a06

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

@ -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) { if ($shiftTask) {
return [ return [
'status' => false, 'status' => false,

Loading…
Cancel
Save