首页 发现 帮助
注册 登录
xiegeng
/
ship-expert
1
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

修改用户代理

邹景立 3 年之前
父节点
3604bc17b6
当前提交
a74cd5b253
共有 12 个文件被更改，包括 32 次插入 和 21 次删除
分列视图 显示文件统计
  1. 1 1
      app/admin/view/full.html
  2. 1 1
      app/data/controller/api/auth/Center.php
  3. 3 3
      app/data/controller/user/Admin.php
  4. 1 1
      app/data/service/OrderService.php
  5. 8 7
      app/data/service/UserUpgradeService.php
  6. 7 2
      app/data/view/user/admin/index.html
  7. 2 4
      app/data/view/user/admin/parent.html
  8. 1 0
      public/static/admin.js
  9. 0 0
      public/static/theme/css/console.css
  10. 0 0
      public/static/theme/css/console.css.map
  11. 7 1
      public/static/theme/css/console.display.less
  12. 1 1
      vendor/services.php

+ 1 - 1
app/admin/view/full.html
查看文件 

@@ -20,7 +20,7 @@
 
 <body class="layui-layout-body">
 
 {block name='body'}
 
 <div class="layui-layout layui-layout-admin layui-layout-left-hide">
 
-    <div class="layui-body think-bg-white" style="top:0">{block name='content'}{/block}</div>
 
+    <div class="layui-body think-bg-white margin-0 padding-0" style="top:0">{block name='content'}{/block}</div>
 
 </div>
 
 {/block}
 
 <script src="__ROOT__/static/plugs/layui/layui.js"></script>

+ 1 - 1
app/data/controller/api/auth/Center.php
查看文件 

@@ -149,7 +149,7 @@ class Center extends Auth
 
     public function bindFrom()
 
     {
 
         $data = $this->_vali(['from.require' => '邀请人不能为空']);
 
-        [$state, $message] = UserUpgradeService::instance()->bindAgent($this->uuid, $data['from'], false);
 
+        [$state, $message] = UserUpgradeService::instance()->bindAgent($this->uuid, $data['from'], 0);
 
         if ($state) {
 
             $this->success($message, UserAdminService::instance()->total($this->uuid));
 
         } else {

+ 3 - 3
app/data/controller/user/Admin.php
查看文件 

@@ -105,7 +105,7 @@ class Admin extends Controller
 
         $map = $this->_vali(['id.require' => '用户ID不能为空！']);
 
         $user = $this->app->db->name($this->table)->where($map)->find();
 
         if (empty($user) || empty($user['pid0'])) $this->error('用户不符合操作要求！');
 
-        [$status, $message] = UserUpgradeService::instance()->bindAgent($user['id'], $user['pid0'], true);
 
+        [$status, $message] = UserUpgradeService::instance()->bindAgent($user['id'], $user['pid0'], 1);
 
         $status && sysoplog('前端用户管理', "后台修改用户[{$map['id']}]的代理为永久状态");
 
         empty($status) ? $this->error($message) : $this->success($message);
 
     }
 
@@ -130,10 +130,10 @@ class Admin extends Controller
 
             $db = $this->_query($this->table)->equal('vip_code#from_vipcode')->like('phone#from_phone,username|nickname#from_username')->db();
 
             if ($db->getOptions('where')) $query->whereRaw("pid1 in {$db->field('id')->buildSql()}");
 
             // 数据查询分页
 
-            $query->like('phone,username|nickname#username')->equal('status,vip_code')->dateBetween('create_at')->page();
 
+            $query->like('phone,username|nickname#username')->whereRaw('vip_code>0')->equal('status,vip_code')->dateBetween('create_at')->page();
 
         } else {
 
             $data = $this->_vali(['pid.require' => '待绑定代理不能为空！', 'uid.require' => '待操作用户不能为空！']);
 
-            [$status, $message] = UserUpgradeService::instance()->bindAgent($data['uid'], $data['pid'], false);
 
+            [$status, $message] = UserUpgradeService::instance()->bindAgent($data['uid'], $data['pid'], 2);
 
             $status && sysoplog('前端用户管理', "后台修改用户[{$data['uid']}]的代理为[{$data['pid']}]");
 
             empty($status) ? $this->error($message) : $this->success($message);
 
         }

+ 1 - 1
app/data/service/OrderService.php
查看文件 

@@ -58,7 +58,7 @@ class OrderService extends Service
 
         // 尝试绑定代理用户
 
         if (empty($user['pids']) && ($order['puid1'] > 0 || $user['pid1'] > 0)) {
 
             $puid1 = $order['puid1'] > 0 ? $order['puid1'] : $user['pid0'];
 
-            UserUpgradeService::instance()->bindAgent($user['id'], $puid1);
 
+            UserUpgradeService::instance()->bindAgent($user['id'], $puid1, 1);
 
         }
 
         // 重置用户信息并绑定订单
 
         $user = $this->app->db->name('DataUser')->where(['id' => $order['uid']])->find();

+ 8 - 7
app/data/service/UserUpgradeService.php
查看文件 

@@ -26,17 +26,17 @@ class UserUpgradeService extends Service
 
      * 尝试绑定上级代理
 
      * @param integer $uid 用户UID
 
      * @param integer $pid 代理UID
 
-     * @param boolean $force 正式绑定
 
+     * @param integer $mod 操作类型（0临时绑定, 1永久绑定, 2强行绑定）
 
      * @return array
 
      * @throws \think\db\exception\DataNotFoundException
 
      * @throws \think\db\exception\DbException
 
      * @throws \think\db\exception\ModelNotFoundException
 
      */
 
-    public function bindAgent(int $uid, int $pid = 0, bool $force = true): array
 
+    public function bindAgent(int $uid, int $pid = 0, int $mod = 1): array
 
     {
 
         $user = $this->app->db->name('DataUser')->where(['id' => $uid])->find();
 
         if (empty($user)) return [0, '用户查询失败'];
 
-        if ($user['pids']) return [1, '已经绑定代理'];
 
+        if ($user['pids'] && in_array($mod, [0, 1])) return [1, '已经绑定代理'];
 
         // 检查代理用户
 
         if (empty($pid)) $pid = $user['pid0'];
 
         if (empty($pid)) return [0, '绑定的代理不存在'];
 
@@ -47,12 +47,13 @@ class UserUpgradeService extends Service
 
         if (stripos($agent['path'], "-{$uid}-") !== false) return [0, '不能绑定下属'];
 
         // 组装代理数据
 
         $result = [0, '绑定代理失败'];
 
-        $this->app->db->transaction(function () use ($user, $agent, $force, &$result) {
 
+        $this->app->db->transaction(function () use ($user, $agent, $mod, &$result) {
 
             // 更新用户代理
 
             $path1 = rtrim($agent['path'] ?: '-', '-') . "-{$agent['id']}-";
 
-            $data1 = ['pid0' => $agent['id'], 'pid1' => $agent['id'], 'pid2' => $agent['pid1']];
 
-            $data2 = ['pids' => intval($force), 'path' => $path1, 'layer' => substr_count($path1, '-')];
 
-            $this->app->db->name('DataUser')->where(['id' => $user['id']])->update(array_merge($data1, $data2));
 
+            $this->app->db->name('DataUser')->where(['id' => $user['id']])->update([
 
+                'pid0' => $agent['id'], 'pid1' => $agent['id'], 'pid2' => $agent['pid1'],
 
+                'pids' => $mod > 0 ? 1 : 0, 'path' => $path1, 'layer' => substr_count($path1, '-'),
 
+            ]);
 
             // 更新下级代理
 
             $path2 = "{$user['path']}{$user['id']}-";
 
             if ($this->app->db->name('DataUser')->whereLike('path', "{$path2}%")->count() > 0) {

+ 7 - 2
app/data/view/user/admin/index.html
查看文件 

@@ -100,7 +100,12 @@
 
                 <td class="nowrap">
 
                     <div>累计交易：<b class="color-blue font-s14">{$vo.order_amount_total+0}</b> 元</div>
 
                     <div>使用状态：{if $vo.status eq 0}<b class="color-red">已冻结</b>{elseif $vo.status eq 1}<b class="color-green">已激活</b>{/if}
 
-                        <!--{notempty name='vo.pids'}--><b class="margin-left-5 color-green">永久绑定</b><!--{else}-->
 
+                        <!--{notempty name='vo.pids'}-->
 
+                        <b class="margin-left-5 color-green">永久绑定</b>
 
+                        <!--{if auth('parent')}-->
 
+                        <a data-width="1080px" data-height="700px" data-iframe="{:url('parent')}?uid={$vo.id}" class="margin-left-5 notselect">更改绑定</a>
 
+                        <!--{/if}-->
 
+                        <!--{else}-->
 
                         {notempty name='vo.pid0'}
 
                         <b class="margin-left-5 color-red">临时绑定</b>
 
                         <!--{if auth('forever')}-->
 
@@ -109,7 +114,7 @@
 
                         {else}
 
                         <b class="margin-left-5 color-desc">没有绑定</b>
 
                         <!--{if auth('parent')}-->
 
-                        <a data-width="1080px" data-iframe="{:url('parent')}?uid={$vo.id}" class="margin-left-5 notselect">设置绑定</a>
 
+                        <a data-width="1080px" data-height="700px" data-iframe="{:url('parent')}?uid={$vo.id}" class="margin-left-5 notselect">设置绑定</a>
 
                         <!--{/if}-->
 
                         {/notempty}
 
                         <!--{/notempty}-->

+ 2 - 4
app/data/view/user/admin/parent.html
查看文件 

@@ -10,6 +10,7 @@
 
             <th class='nowrap'>用户信息</th>
 
             <th class='nowrap'>注册时间</th>
 
             <th class='nowrap'></th>
 
+            <th></th>
 
         </tr>
 
         </thead>
 
         {/notempty}
 
@@ -60,11 +61,9 @@
 
                 注册时间：{$vo.create_at|format_datetime}
 
             </td>
 
             <td class="nowrap text-right">
 
-
 
                 <!--{if auth("parent")}-->
 
-                <a class="layui-btn layui-btn-sm layui-btn-primary" data-parent-uid="{:input('uid')}" data-parent-pid="{$vo.id}">确认选择</a>
 
+                <a class="layui-btn layui-btn-sm layui-btn-primary" data-parent-uid="{:input('uid')}" data-parent-pid="{$vo.id}">选择绑定</a>
 
                 <!--{/if}-->
 
-
 
             </td>
 
         </tr>
 
         {/foreach}
 
@@ -77,7 +76,6 @@
 
 {block name='script'}
 
 <script>
 
     $('body').off('click', '[data-parent-uid]').on('click', '[data-parent-uid]', function () {
 
-        $.queue()
 
         $.form.load('{:sysuri()}', {uid: this.dataset.parentUid, pid: this.dataset.parentPid}, 'post', function (ret) {
 
             if (ret.code > 0) return $.msg.success(ret.info, 3, function () {
 
                 top.layer.close(top.layer.getFrameIndex(window.name));

+ 1 - 0
public/static/admin.js
查看文件 

@@ -745,6 +745,7 @@ $(function () {
 
 
     /*! 注册 data-iframe 事件行为 */
 
     onEvent('click', '[data-iframe]', function () {
 
+
 
         $(this).attr('data-index', $.form.iframe(this.dataset.iframe, this.dataset.title || this.innerText || '窗口', this.dataset.area || [
 
             this.dataset.width || '800px', this.dataset.height || '580px'
 
         ]));

文件差异内容过多而无法显示
+ 0 - 0
public/static/theme/css/console.css


文件差异内容过多而无法显示
+ 0 - 0
public/static/theme/css/console.css.map


+ 7 - 1
public/static/theme/css/console.display.less
查看文件 

@@ -708,7 +708,13 @@ label.think-radio, label.think-checkbox {
 
 
 /*! 重置 Iframe 页面样式 */
 
 .iframe-pagination {
 
-  padding: 20px 20px 0 20px;
 
+  padding: 20px;
 
+
 
+  &:after {
 
+    content: '';
 
+    height: 30px;
 
+    display: block;
 
+  }
 
 
   .pagination-container {
 
     left: 0;

+ 1 - 1
vendor/services.php
查看文件 

@@ -1,5 +1,5 @@
 
 <?php 
-// This file is automatically generated at:2021-05-19 17:44:07
 
+// This file is automatically generated at:2021-05-19 18:51:50
 
 declare (strict_types = 1);
 
 return array (
 
   0 => 'think\\admin\\Library',

部分文件因为文件数量过多而无法显示