afa 1 сар өмнө
parent
commit
609c13d9f3

+ 37 - 0
application/admin/controller/user/Codeuserlog.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace app\admin\controller\user;
+
+use app\common\controller\Backend;
+
+/**
+ * 用户激活记录
+ *
+ * @icon fa fa-circle-o
+ */
+class Codeuserlog extends Backend
+{
+
+    /**
+     * Codeuserlog模型对象
+     * @var \app\admin\model\user\Codeuserlog
+     */
+    protected $model = null;
+
+    public function _initialize()
+    {
+        parent::_initialize();
+        $this->model = new \app\admin\model\user\Codeuserlog;
+        $this->view->assign("statusList", $this->model->getStatusList());
+    }
+
+
+
+    /**
+     * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法
+     * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑
+     * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
+     */
+
+
+}

+ 14 - 0
application/admin/lang/zh-cn/user/codeuserlog.php

@@ -0,0 +1,14 @@
+<?php
+
+return [
+    'Id'          => 'ID',
+    'User_id'     => '激活用户Id',
+    'Gift1'       => '激活礼品1',
+    'Gift2'       => '激活礼品2',
+    'Frozen'      => '茶宝手续费',
+    'Code_no'     => '激活码',
+    'Level'       => '激活等级',
+    'Status'      => '状态',
+    'Create_time' => '创建时间',
+    'Update_time' => '更新时间'
+];

+ 73 - 0
application/admin/model/user/Codeuserlog.php

@@ -0,0 +1,73 @@
+<?php
+
+namespace app\admin\model\user;
+
+use think\Model;
+
+
+class Codeuserlog extends Model
+{
+
+    
+
+    
+
+    // 表名
+    protected $table = 'code_user_log';
+    
+    // 自动写入时间戳字段
+    protected $autoWriteTimestamp = false;
+
+    // 定义时间戳字段名
+    protected $createTime = false;
+    protected $updateTime = false;
+    protected $deleteTime = false;
+
+    // 追加属性
+    protected $append = [
+        'status_text',
+        'create_time_text',
+        'update_time_text'
+    ];
+    
+
+    
+    public function getStatusList()
+    {
+        return ['30' => __('Status 30')];
+    }
+
+
+    public function getStatusTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['status']) ? $data['status'] : '');
+        $list = $this->getStatusList();
+        return isset($list[$value]) ? $list[$value] : '';
+    }
+
+
+    public function getCreateTimeTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['create_time']) ? $data['create_time'] : '');
+        return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value;
+    }
+
+
+    public function getUpdateTimeTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['update_time']) ? $data['update_time'] : '');
+        return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value;
+    }
+
+    protected function setCreateTimeAttr($value)
+    {
+        return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value);
+    }
+
+    protected function setUpdateTimeAttr($value)
+    {
+        return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value);
+    }
+
+
+}

+ 27 - 0
application/admin/validate/user/Codeuserlog.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace app\admin\validate\user;
+
+use think\Validate;
+
+class Codeuserlog extends Validate
+{
+    /**
+     * 验证规则
+     */
+    protected $rule = [
+    ];
+    /**
+     * 提示消息
+     */
+    protected $message = [
+    ];
+    /**
+     * 验证场景
+     */
+    protected $scene = [
+        'add'  => [],
+        'edit' => [],
+    ];
+    
+}

+ 70 - 0
application/admin/view/user/codeuserlog/add.html

@@ -0,0 +1,70 @@
+<form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('User_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-user_id" data-rule="required" data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Gift1')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-gift1" class="form-control" name="row[gift1]" type="number" value="0">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Gift2')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-gift2" class="form-control" name="row[gift2]" type="number" value="0">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Frozen')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-frozen" class="form-control" step="0.000001" name="row[frozen]" type="number" value="0.000000">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Code_no')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-code_no" class="form-control" name="row[code_no]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Level')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-level" data-rule="required" class="form-control" name="row[level]" type="number" value="0">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            
+            <div class="radio">
+            {foreach name="statusList" item="vo"}
+            <label for="row[status]-{$key}"><input id="row[status]-{$key}" name="row[status]" type="radio" value="{$key}" {in name="key" value="30"}checked{/in} /> {$vo}</label> 
+            {/foreach}
+            </div>
+
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Create_time')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-create_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[create_time]" type="text" value="{:date('Y-m-d H:i:s')}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Update_time')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-update_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[update_time]" type="text" value="{:date('Y-m-d H:i:s')}">
+        </div>
+    </div>
+    <div class="form-group layer-footer">
+        <label class="control-label col-xs-12 col-sm-2"></label>
+        <div class="col-xs-12 col-sm-8">
+            <button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
+            <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
+        </div>
+    </div>
+</form>

+ 70 - 0
application/admin/view/user/codeuserlog/edit.html

@@ -0,0 +1,70 @@
+<form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('User_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-user_id" data-rule="required" data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="{$row.user_id|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Gift1')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-gift1" class="form-control" name="row[gift1]" type="number" value="{$row.gift1|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Gift2')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-gift2" class="form-control" name="row[gift2]" type="number" value="{$row.gift2|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Frozen')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-frozen" class="form-control" step="0.000001" name="row[frozen]" type="number" value="{$row.frozen|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Code_no')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-code_no" class="form-control" name="row[code_no]" type="text" value="{$row.code_no|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Level')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-level" data-rule="required" class="form-control" name="row[level]" type="number" value="{$row.level|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            
+            <div class="radio">
+            {foreach name="statusList" item="vo"}
+            <label for="row[status]-{$key}"><input id="row[status]-{$key}" name="row[status]" type="radio" value="{$key}" {in name="key" value="$row.status"}checked{/in} /> {$vo}</label> 
+            {/foreach}
+            </div>
+
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Create_time')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-create_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[create_time]" type="text" value="{:$row.create_time?datetime($row.create_time):''}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Update_time')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-update_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[update_time]" type="text" value="{:$row.update_time?datetime($row.update_time):''}">
+        </div>
+    </div>
+    <div class="form-group layer-footer">
+        <label class="control-label col-xs-12 col-sm-2"></label>
+        <div class="col-xs-12 col-sm-8">
+            <button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
+            <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
+        </div>
+    </div>
+</form>

+ 23 - 0
application/admin/view/user/codeuserlog/index.html

@@ -0,0 +1,23 @@
+<div class="panel panel-default panel-intro">
+    
+    <div class="panel-heading">
+        {:build_heading(null,FALSE)}
+    </div>
+
+
+    <div class="panel-body">
+        <div id="myTabContent" class="tab-content">
+            <div class="tab-pane fade active in" id="one">
+                <div class="widget-body no-padding">
+                    <div id="toolbar" class="toolbar">
+                        <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
+                    </div>
+                    <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
+                           width="100%">
+                    </table>
+                </div>
+            </div>
+
+        </div>
+    </div>
+</div>

+ 1 - 0
application/api/controller/User.php

@@ -67,6 +67,7 @@ class User extends Api
             'team_level_id'   => $user['team_level_id'], // 团队等级
             'invite_link'     => config('rental.invite_domain') . '/?inviteCode=' . $user['address'],
             'take_address'    => $userArea::getUserDefaultAdders($user['id']),  // 用户地址
+            'create_time'     => $user['create_time'], // 创建时间
         ];
         $this->success('', $resp);
     }

+ 1 - 3
application/api/logic/CodenoLogic.php

@@ -20,10 +20,8 @@ class CodenoLogic
       public static function setActivate(int $uid, int $level, string $code_no)
       {
             $config = config('code_config');
-            $frozen = 0;
             if(empty($level)){
                   // 发放冻结金额
-                  $frozen = $config[$level]['num'];
                   Loader::model('LedgerWalletModel')->changeWalletAccount($uid, Asset::FROZEN, $config[$level]['num'], LedgerFrozenChangeModel::CodeNo, $uid);
             }else{
                   //添加激活码数量
@@ -31,7 +29,7 @@ class CodenoLogic
             }
 
             //添加激活码记录
-            CodeUserLogModel::addCodeUserLog($uid, $level, $config[$level]['gift1']['product_id'], $config[$level]['gift2']['product_id'], $frozen, $code_no);
+            CodeUserLogModel::addCodeUserLog($uid, $level, $config[$level]['gift1']['product_id'], $config[$level]['gift2']['product_id'], $config[$level]['num'], $code_no);
 
             // 空投产品礼包1
             ProductOrder::setPopularNoAreaOrder($config[$level]['gift2']['num'], 0, 0, $config[$level]['gift1']['product_id'], $uid, ProductOrder::Airdrop);

+ 65 - 0
public/assets/js/backend/user/codeuserlog.js

@@ -0,0 +1,65 @@
+define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
+
+    var Controller = {
+        index: function () {
+            // 初始化表格参数配置
+            Table.api.init({
+                extend: {
+                    index_url: 'user/codeuserlog/index' + location.search,
+                    del_url: 'user/codeuserlog/del',
+                    multi_url: 'user/codeuserlog/multi',
+                    import_url: 'user/codeuserlog/import',
+                    table: 'code_user_log',
+                }
+            });
+
+            var table = $("#table");
+
+            // 初始化表格
+            table.bootstrapTable({
+                url: $.fn.bootstrapTable.defaults.extend.index_url,
+                pk: 'id',
+                sortName: 'id',
+                fixedColumns: true,
+                fixedRightNumber: 1,
+                columns: [
+                    [
+                        {checkbox: true},
+                        {field: 'id', title: __('Id')},
+                        {field: 'user_id', title: __('User_id')},
+                        {field: 'gift1', title: __('Gift1')},
+                        {field: 'gift2', title: __('Gift2')},
+                        {field: 'frozen', title: __('Frozen'), operate:false},
+                        {field: 'frozen', title: __('激活码数量'), operate: false, formatter: function (value, row, index, field) {
+
+                            if(row.level == 0){
+                                return 0;
+                            }
+                            return Number(row.frozen);
+                        } },
+                        {field: 'code_no', title: __('Code_no'), operate: false},
+                        {field: 'level', title: __('Level'), searchList: {0:__('V1'), 1:__('V2'), 2:__('V3'), 3:__('V4')}, formatter: Table.api.formatter.status},
+                        {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'update_time', title: __('Update_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+                    ]
+                ]
+            });
+
+            // 为表格绑定事件
+            Table.api.bindevent(table);
+        },
+        add: function () {
+            Controller.api.bindevent();
+        },
+        edit: function () {
+            Controller.api.bindevent();
+        },
+        api: {
+            bindevent: function () {
+                Form.api.bindevent($("form[role=form]"));
+            }
+        }
+    };
+    return Controller;
+});