diff --git a/Application/Base/Service/PromoteService.class.php b/Application/Base/Service/PromoteService.class.php index 5e52f3eb9..cf0b60d1d 100644 --- a/Application/Base/Service/PromoteService.class.php +++ b/Application/Base/Service/PromoteService.class.php @@ -107,12 +107,12 @@ class PromoteService { ]; } - if ($type == 1 && $balanceCoinMode == 0) { + /* if ($type == 1 && $balanceCoinMode == 0) { return [ 'status' => false, 'msg'=>'请选择平台币管理方式' ]; - } + } */ if (count($shiftIds) > 15) { return [ @@ -182,12 +182,12 @@ class PromoteService { } $topPromote = $this->getTopPromote($fromPromote); - $status = $this->shiftRemoveCoin($fromPromote, $task); + // $status = $this->shiftRemoveCoin($fromPromote, $task); - if (!$status) { + /* if (!$status) { $model->rollback(); return ['status' => false, 'msg' => '系统异常, 处理推广员平台币失败']; - } + } */ $firstMap = ['parent_id' => $fromPromote['id']]; $secondMap = ['chain' => ['like', $fromPromote['chain'] . $fromPromote['id'] . '/%']]; diff --git a/Application/Home/Controller/PromoteCoinController.class.php b/Application/Home/Controller/PromoteCoinController.class.php index ecc22e293..9c92f59e3 100644 --- a/Application/Home/Controller/PromoteCoinController.class.php +++ b/Application/Home/Controller/PromoteCoinController.class.php @@ -649,22 +649,13 @@ class PromoteCoinController extends BaseController $map = ['chain' => ['like', $promote['chain'] . $promote['id'] . '/%']]; $promoteIds = D('Promote')->field('id')->where($map)->getField('id', true); $promoteIds[] = $id; - $rows = D('UserPlay')->field(['id', 'user_id'])->where(['promote_id' => ['in', $promoteIds]])->select(); - - $map = []; - $userIds = array_column($rows, 'user_id'); - if (count($userIds) > 0) { - $map = ['id' => ['in', array_column($rows, 'user_id')]]; - } else { - $map = ['_string' => '1<>1']; - } - if ($account) { $map['account'] = ['like', '%' . $account . '%']; } if ($mobile) { $map['mobile_phone'] = ['like', '%' . $mobile . '%']; } + $map['promote_id'] = ['in',$promoteIds]; $query = M('User', 'tab_')->field(['id', 'phone', 'account', 'real_name'])->where($map); list($users, $pagination, $count) = $this->paginate($query); diff --git a/Application/Home/View/default/PromoteCoin/coinDetails.html b/Application/Home/View/default/PromoteCoin/coinDetails.html index d818e1f6d..9bf4a918b 100644 --- a/Application/Home/View/default/PromoteCoin/coinDetails.html +++ b/Application/Home/View/default/PromoteCoin/coinDetails.html @@ -134,10 +134,6 @@