道具核销

application/admin/controller/Decoratelianmeng.php

@@ -37,49 +37,6 @@ class Decoratelianmeng extends Backend
      * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
      */
 
-
-    /**
-     * 核销
-     */
-    public function audit(){
-        $id = input('id');
-        $info = Db::name('userdecoratelianmeng')
-            ->where('id',$id)
-            ->find();
-
-        if ($this->request->isPost()) {
-            $status = input('status',0);
-            $data = [
-                'status' => $status,
-                'auditremark' => input('auditremark',''),
-                'audittime' => strtotime(input('audittime','')),
-                'updatetime' => time(),
-            ];
-            Db::startTrans();
-            $rs = Db::name('take_cash')->where('id',$id)->update($data);
-
-            if($status == 1){
-                //系统消息
-                $msg_id = \app\common\model\Message::addMessage($info['user_id'],'提现审核','提现审核已经通过');
-            }elseif($status == 2){
-                //还钱
-                $wallet_rs = model('wallet')->lockChangeAccountRemain($info['user_id'],'money',$info['money'],16,'提现被拒返回:'.$info['money'],'take_cash',$info['id']);
-                if($wallet_rs['status'] === false){
-                    Db::rollback();
-                    $this->error($wallet_rs['msg']);
-                }
-                //系统消息
-                $msg_id = \app\common\model\Message::addMessage($info['user_id'],'提现审核','提现审核已经被拒绝');
-            }
-            Db::commit();
-
-            $this->success('审核完成');
-        }
-
-
-        $this->assign('row',$info);
-        return $this->view->fetch();
-    }
     
 
 }

application/admin/controller/Userdecoratelianmeng.php

@@ -3,7 +3,7 @@
 namespace app\admin\controller;
 
 use app\common\controller\Backend;
-
+use think\Db;
 /**
  * 用户联盟道具管理
  *
@@ -23,6 +23,7 @@ class Userdecoratelianmeng extends Backend
         parent::_initialize();
         $this->model = new \app\admin\model\Userdecoratelianmeng;
         $this->view->assign("isUsingList", $this->model->getIsUsingList());
+        $this->view->assign("statusList", $this->model->getStatusList());
     }
 
     public function import()
@@ -62,7 +63,7 @@ class Userdecoratelianmeng extends Backend
             foreach ($list as $row) {
                 
                 $row->getRelation('user')->visible(['username','nickname','mobile']);
-				$row->getRelation('decoratelianmeng')->visible(['name']);
+				$row->getRelation('decoratelianmeng')->visible(['name','type']);
             }
 
             $result = array("total" => $list->total(), "rows" => $list->items());
@@ -72,4 +73,76 @@ class Userdecoratelianmeng extends Backend
         return $this->view->fetch();
     }
 
+
+
+    /**
+     * 核销
+     */
+    public function audit(){
+        $id = input('id');
+        $info = Db::name('user_decorate_lianmeng')
+            ->where('id',$id)
+            ->find();
+
+        if ($this->request->isPost()) {
+
+            $status      = input('status',0);
+            $auditremark = input('auditremark','');
+            $audittime   = strtotime(input('audittime',''));
+
+            if($status != 1 && $status !=2){
+                $this->error('待核销无需保存');
+            }
+
+            if($status == 1){
+                //核销成功
+                $data = [
+                    'status'      => $status,
+                    'auditremark' => $auditremark,
+                    'audittime'   => $audittime,
+                ];
+            }
+
+            if($status == 2){
+                //核销失败
+                $data = [
+                    /*'status'      => $status,
+                    'auditremark' => $auditremark,
+                    'audittime'   => $audittime,*/
+
+                    //初始化
+                    'is_using'  => 0,
+                    'plat_name' => '',
+                ];
+            }
+
+            Db::startTrans();
+            $rs = Db::name('user_decorate_lianmeng')->where('id',$id)->update($data);
+
+            //道具详情
+            $daoju_info = Db::name('decorate_lianmeng')->field('name,type')->where('id',$info['decorate_id'])->find();
+            $type_arr = [
+                1 => '吉傲T币',
+                2 => '吉傲会员',
+                3 => '联盟商家币',
+                4 => '联盟商家会员'
+            ];
+            $daoju_name = $type_arr[$daoju_info['type']].':'.$daoju_info['name'];
+
+            if($status == 1){
+                //系统消息
+                $msg_id = \app\common\model\Message::addMessage($info['user_id'],'道具核销成功','道具'. $daoju_name .',于'. date('Y年m月d日 H时i分') .'核销成功，请前往联盟商家查看到账情况');
+            }elseif($status == 2){
+                //系统消息
+                $msg_id = \app\common\model\Message::addMessage($info['user_id'],'道具核销失败','道具'. $daoju_name .',于'. date('Y年m月d日 H时i分') .'核销失败，原因：'.$auditremark);
+            }
+            Db::commit();
+
+            $this->success('核销完成');
+        }
+
+
+        $this->assign('row',$info);
+        return $this->view->fetch();
+    }
 }

application/admin/lang/zh-cn/userdecoratelianmeng.php

@@ -1,21 +1,21 @@
 <?php
 
 return [
-    'Id'                    => 'ID',
-    'User_id'               => '用户ID',
-    'Decorate_id'           => '道具ID',
-    'Createtime'            => '创建时间',
-    'Updatetime'            => '更新时间',
-    'Is_using'              => '状态',
-    'Is_using 1'            => '已使用',
-    'Is_using 0'            => '未使用',
-    'Plat_name'             => '对应平台用户名',
-    'Status'                => '核销状态',
-    'Status 0'              => '待核销',
-    'Status 1'              => '核销成功',
-    'Status 2'              => '核销失败',
-    'Audittime'             => '核销时间',
-    'Auditremark'           => '核销失败原因',
+    'Id'          => 'ID',
+    'User_id'     => '用户ID',
+    'Decorate_id' => '道具ID',
+    'Createtime'  => '创建时间',
+    'Updatetime'  => '更新时间',
+    'Is_using'    => '使用状态',
+    'Is_using 1'  => '已使用',
+    'Is_using 0'  => '未使用',
+    'Plat_name'   => '对应平台用户名',
+    'Status'      => '核销状态',
+    'Status 0'    => '待核销',
+    'Status 1'    => '核销成功',
+    'Status 2'    => '核销失败',
+    'Audittime'   => '核销时间',
+    'Auditremark' => '核销失败原因',
     'User.username'         => '用户名',
     'User.nickname'         => '昵称',
     'User.mobile'           => '手机号',

application/admin/model/Userdecoratelianmeng.php

@@ -25,7 +25,9 @@ class Userdecoratelianmeng extends Model
 
     // 追加属性
     protected $append = [
-        'is_using_text'
+        'is_using_text',
+        'status_text',
+        'audittime_text'
     ];
     
 
@@ -35,6 +37,11 @@ class Userdecoratelianmeng extends Model
         return ['1' => __('Is_using 1'), '0' => __('Is_using 0')];
     }
 
+    public function getStatusList()
+    {
+        return ['0' => __('Status 0'), '1' => __('Status 1'), '2' => __('Status 2')];
+    }
+
 
     public function getIsUsingTextAttr($value, $data)
     {
@@ -44,6 +51,24 @@ class Userdecoratelianmeng extends Model
     }
 
 
+    public function getStatusTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['status']) ? $data['status'] : '');
+        $list = $this->getStatusList();
+        return isset($list[$value]) ? $list[$value] : '';
+    }
+
+
+    public function getAudittimeTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['audittime']) ? $data['audittime'] : '');
+        return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value;
+    }
+
+    protected function setAudittimeAttr($value)
+    {
+        return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value);
+    }
 
 
     public function user()
@@ -56,4 +81,5 @@ class Userdecoratelianmeng extends Model
     {
         return $this->belongsTo('Decoratelianmeng', 'decorate_id', 'id', [], 'LEFT')->setEagerlyType(0);
     }
+
 }

application/admin/view/userdecoratelianmeng/add.html

@@ -30,6 +30,30 @@
             <input id="c-plat_name" class="form-control" name="row[plat_name]" type="text" value="">
         </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="0"}checked{/in} /> {$vo}</label> 
+            {/foreach}
+            </div>
+
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Audittime')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-audittime" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[audittime]" 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">{:__('Auditremark')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-auditremark" class="form-control" name="row[auditremark]" type="text" value="">
+        </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">

application/admin/view/userdecoratelianmeng/audit.html

@@ -3,20 +3,20 @@
     <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}">
+            <input id="c-user_id" data-rule="required" data-source="user/user/index" disabled data-field="username" class="form-control selectpage"  type="text" value="{$row.user_id|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Decorate_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-decorate_id" data-rule="required" data-source="decoratelianmeng/index" class="form-control selectpage" name="row[decorate_id]" type="text" value="{$row.decorate_id|htmlentities}">
+            <input id="c-decorate_id" data-rule="required" data-source="decoratelianmeng/index" disabled class="form-control selectpage"  type="text" value="{$row.decorate_id|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Is_using')}:</label>
         <div class="col-xs-12 col-sm-8">
                         
-            <select  id="c-is_using" class="form-control selectpicker" name="row[is_using]">
+            <select  id="c-is_using" disabled class="form-control selectpicker">
                 {foreach name="isUsingList" item="vo"}
                     <option value="{$key}" {in name="key" value="$row.is_using"}selected{/in}>{$vo}</option>
                 {/foreach}
@@ -27,18 +27,17 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Plat_name')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-plat_name" class="form-control" name="row[plat_name]" type="text" value="{$row.plat_name|htmlentities}">
+            <input id="c-plat_name" class="form-control" disabled type="text" value="{$row.plat_name|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="status" type="radio" value="{$key}" {in name="key" value="$row.status"}checked{/in} /> {$vo}</label>
-                {/foreach}
+            {foreach name="statusList" item="vo"}
+            <label for="row[status]-{$key}"><input id="row[status]-{$key}" name="status" type="radio" value="{$key}" {in name="key" value="$row.status"}checked{/in} /> {$vo}</label>
+            {/foreach}
             </div>
 
         </div>
@@ -55,7 +54,6 @@
             <input id="c-auditremark" class="form-control" name="auditremark" type="text" value="{$row.auditremark|htmlentities}">
         </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">

application/admin/view/userdecoratelianmeng/edit.html

@@ -30,6 +30,30 @@
             <input id="c-plat_name" class="form-control" name="row[plat_name]" type="text" value="{$row.plat_name|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">{:__('Audittime')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-audittime" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[audittime]" type="text" value="{:$row.audittime?datetime($row.audittime):''}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Auditremark')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-auditremark" class="form-control" name="row[auditremark]" type="text" value="{$row.auditremark|htmlentities}">
+        </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">

application/admin/view/userdecoratelianmeng/index.html

@@ -1,5 +1,15 @@
 <div class="panel panel-default panel-intro">
-    {:build_heading()}
+    
+    <div class="panel-heading">
+        {:build_heading(null,FALSE)}
+        <ul class="nav nav-tabs" data-field="status">
+            <li class="{:$Think.get.status === null ? 'active' : ''}"><a href="#t-all" data-value="" data-toggle="tab">{:__('All')}</a></li>
+            {foreach name="statusList" item="vo"}
+            <li class="{:$Think.get.status === (string)$key ? 'active' : ''}"><a href="#t-{$key}" data-value="{$key}" data-toggle="tab">{$vo}</a></li>
+            {/foreach}
+        </ul>
+    </div>
+
 
     <div class="panel-body">
         <div id="myTabContent" class="tab-content">

public/assets/js/backend/userdecoratelianmeng.js

@@ -32,11 +32,14 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 //                        {field: 'user.mobile', title: __('User.mobile'), operate: 'LIKE'},
                         {field: 'decorate_id', title: __('Decorate_id')},
                         {field: 'decoratelianmeng.name', title: __('Decoratelianmeng.name'), operate: 'LIKE'},
+                        {field: 'decoratelianmeng.type', title: __('Decoratelianmeng.type')},
                         {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'is_using', title: __('Is_using'), searchList: {"1":__('Is_using 1'),"0":__('Is_using 0')}, formatter: Table.api.formatter.normal},
                         {field: 'plat_name', title: __('Plat_name'), operate: 'LIKE'},
-
+                        {field: 'status', title: __('Status'), searchList: {"0":__('Status 0'),"1":__('Status 1'),"2":__('Status 2')}, formatter: Table.api.formatter.status},
+                        {field: 'audittime', title: __('Audittime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'auditremark', title: __('Auditremark'), operate: 'LIKE'},
                         {field: 'operate', title: __('Operate'), table: table,
                             buttons:[
                                 {