新增审核列表

Application/Admin/Controller/PartnerController.class.php

@@ -12,7 +12,11 @@ use Think\Controller;
 class PartnerController extends ThinkController
 {
     private $modelName = 'Partner';
-
+    public function _initialize()
+    {
+        $this->admininfo = $_SESSION['onethink_admin']['user_auth'];
+        parent::_initialize();
+    }
     //列表
     public function lists()
     {
@@ -202,37 +206,88 @@ class PartnerController extends ThinkController
     //审核列表
     public function index()
     {
+        $page = intval(I('get.p', 0));
+        $page = $page ? $page : 1; //默认显示第一页数据
+        $row = intval(I('row', 0));
+        $row = empty($row) ? 10 : $row;//每页条数
+
+        $map = ["_string"=>"1=1"];
         $model = M("partner_verify", 'tab_');
-        $map = [];
+        $data =  $model->where($map)->page($page,$row)->select();
-        //
+        foreach ($data as $k => &$v) {
+            $v['partner_info'] = json_decode($v['partner_info'],true);
+            if($v['partner_id'] == 0){
+                $v['verify_type'] = "新增";
+            }else{
+                $v['verify_type'] = "修改";
+            }
+            $v['partner_info']['company_type'] = $v['partner_info']['company_type'] == 2 ? '个人' : '公司';
+
+            $contract_start_time = $v['partner_info']['contract_start_time'] ?
+                time_format($v['partner_info']['contract_start_time'], 'Y/m/d') : '-';
+            $contract_end_time = $v['partner_info']['contract_end_time'] ?
+                time_format($v['partner_info']['contract_end_time'], 'Y/m/d') : '-';
+            $v['contract_time'] = $contract_start_time . '-' . $contract_end_time;
+
+            $validity_start_time = $v['partner_info']['validity_start_time'] ?
+                time_format($v['partner_info']['validity_start_time'], 'Y/m/d') : '-';
+            $validity_end_time = $v['partner_info']['validity_end_time'] ?
+                time_format($v['partner_info']['validity_end_time'], 'Y/m/d') : '-';
+            $v['validity_time'] = $validity_start_time . '-' . $validity_end_time;
+            $create_time = date("Y-m-d H:i:s",$v["create_time"]);
+
+            $v["create"]= "{$v['create_admin_account']} <br> {$create_time}";
+
+            if(isset($v['verify_log']['verify_user'])){
+                if($v['verify_status'] == -1){
+                    $ts = "审核拒绝";
+                }else{
+                    $ts = "审核通过";
+                }
+                $v["verify"]= "{$ts}({$v['verify_log']['verify_user']}) {$symbol} {$v['verify_log']['verify_time']}";
+            }else{
+                $v["verify"] = '--';
+            }
+
+        }
+        $count =  $model->where($map)->count();
+        $this->assign('listData', $data);
+        $this->assign('count', $count);
+        $this->assign('VerifyStatus', D("PartnerVerify")->VerifyStatus);
+        $this->meta_title = '上游CP审核列表';
         $this->display();
     }
 
     //添加
     public function add()
     {
-        $model = M($this->modelName, 'tab_');;
+        $model = M("partner_verify", 'tab_');
         if ($_POST) {
             $save = I("post.");
             $this->checkData($save);
             $save['uid'] = UID;
             $save['create_time'] = time();
-            $res = $model->add($save);
+
+            $has_check = M("partner_verify")->where(["partner_name"=>$partner_info['partner'],"verify_status"=>0])->field("id")->find();
+            if ($has_check) {
+                $this->error('已存在同名未审核的cp,请勿重复添加');
+            }
+
+            $res =D("PartnerVerify")->add_db($save);
             if ($res) {
-                \Think\Log::actionLog('Partner/add', 'partner', $res);
                 //操作日志
                 addOperationLog(array(
                     "op_type"=>0,
                     "key"=>$save['partner'],
                     "url"=>U("Partner/lists",array("partner"=>$save['partner']))
                 ));
-                $this->success('保存成功', U('lists'));
+                $this->success('保存成功,请联系管理尽快审核', U('lists'));
             } else {
                 $this->error('保存失败');
             }
         } else {
             $this->assign('commonset', M('Kuaijieicon')->where(['url' => 'Partner/add'])->find());
-            $this->meta_title = '新增合作方';
+            $this->meta_title = '新增上游CP公司';
             $this->display();
         }
     }
@@ -245,7 +300,8 @@ class PartnerController extends ThinkController
         if ($_POST) {
             $save = I("post.");
             $this->checkData($save);
-            $res = $model->save($save);
+            $res =D("PartnerVerify")->edit_db($save);
+            // $res = M("partner_verify", 'tab_')->save($verifydata);
             if ($res === false) {
                 $this->error('保存失败');
             } else {

Application/Admin/Model/PartnerVerifyModel.class.php

@@ -0,0 +1,67 @@
+<?php
+
+namespace Admin\Model;
+
+use Think\Model;
+
+class PartnerVerifyModel extends Model
+{
+    protected $tablePrefix = 'tab_';
+    public $VerifyStatus=[
+        "-1"=>"审核拒绝",
+        "0"=>"未审核",
+        "1"=>"审核通过"
+    ];
+    public function getVerifyCompanyInfo($id)
+    {
+        
+    }
+    /**
+     * 新增
+     * @param [array]] $partner_info 公司信息
+     * @return void
+     */
+    public function add_db($partner_info)
+    {
+        $verifydata = [
+            "partner_id"=>0,
+            "partner_name"=>$partner_info['partner'],
+            "verify_status"=>0,
+            "create_admin_id"=>UID,
+            "create_admin_account"=>$_SESSION['onethink_admin']['user_auth']['username'],
+            "create_time"=>time()
+        ];
+        $verifydata['partner_info'] = json_encode($partner_info,JSON_UNESCAPED_UNICODE);
+        return $this->add($verifydata);
+    }
+    public function edit_db($partner_info)
+    {
+        if(!isset($partner_info['id'])){
+            return false;
+        }
+        $p_id = $partner_info['id'];
+
+        $verifydata = [
+            "partner_id"=>$p_id,
+            "partner_name"=>$partner_info['partner'],
+            "verify_status"=>0,
+            "create_admin_id"=>UID,
+            "create_admin_account"=>$_SESSION['onethink_admin']['user_auth']['username'],
+            "create_time"=>time(),
+            "verify_log"=>''
+        ];
+        $verifydata['partner_info'] = json_encode($partner_info,JSON_UNESCAPED_UNICODE);
+        
+        //判断是否存在
+        $has =  $this->where("partner_id = {$p_id}")->find();
+        if($has){
+            //存在
+            $verifydata['id'] = $has['id'];
+            $res =  $this->save($verifydata);
+        }else{
+            $res =  $this->add($verifydata);
+        }
+        return $res;
+    }
+    
+}

Application/Admin/View/Partner/export.html

@@ -73,7 +73,6 @@
                     <th>生效期限</th>
                     <th>开票税点</th>
 
-                    <th>发票类型</th>
                     <th>发票类型</th>
                     <th>税费费率</th>
                     
@@ -131,6 +130,7 @@
 
                             <td rowspan="{$data.row}">{$data.invoice_type}</td>
                             <td rowspan="{$data.row}">{$data.taxation_rate}%</td>
+
                             <td rowspan="{$data.row}">{$data.channel_rate}%</td>
                             <td rowspan="{$data.row}">{$data.reg_address}</td>
                             <td rowspan="{$data.row}">{$data.reg_phone}</td>

Application/Admin/View/Partner/index.html

@@ -49,23 +49,32 @@
 
             <div class="input-list input-list-game search_label_rehab">
                 <select id="company_type" name="company_type" class="select_gallery" >
-                    <option value="">请选择公司性质</option>
+                    <option value="">审核类型</option>
-                    <option value="1">公司</option>
+                    <option value="1">新增</option>
-                    <option value="2">个人</option>
+                    <option value="2">修改</option>
                 </select>
             </div>
 
             <div class="input-list">
                 <input type="text"  id="time-start" name="timestart" class="" value="{$startDate}"
-                       placeholder="开始时间"/>
+                       placeholder="创建开始时间"/>
                 -
                 <div class="input-append date" id="datetimepicker" style="display:inline-block">
                     <input type="text"  id="time-end" name="timeend" class="" value="{$endDate}"
-                           placeholder="结束时间"/>
+                           placeholder="创建结束时间"/>
                     <span class="add-on"><i class="icon-th"></i></span>
                 </div>
             </div>
 
+            <div class="input-list input-list-promote search_label_rehab">
+                <select id="verify_status" name="verify_status" class="select_gallery" >
+                    <option value="">请选择审核状态</option>
+                    <volist name="VerifyStatus" id="vo">
+                        <option value="{$key}" <if condition="isset($_GET['verify_status']) && $key eq I('verify_status')">selected</if> >{$vo}</option>
+                    </volist>
+                </select>
+            </div>
+
             <div class="input-list">
                 <a class="sch-btn" href="javascript:;" id="search" url="{:U('lists','model='.$model['name'] .'&row='.I('row'),false)}">搜索</a>
             </div>
@@ -82,22 +91,25 @@
                     
                     <th>合同合作方名称</th>
                     <th>对应平台</th>
+                    <th>审核类型</th>
+                    
                     <th>公司性质</th>
                     <th>合同期限</th>
                     <th>结算生效期限</th>
 
                     <th>渠道费率</th>
                     <th>开票税点</th>
-                    <th>结算生效期限</th>
+                    <th>税费费率</th>
-                    
 
                     <th>帐户名</th>
                     <th>银行账号</th>
                     <th>收款银行</th>
 
-                    <th>是否有预付款</th>
+                    <th>创建记录</th>
+                    <th>审核记录</th>
+
 
-                    <th style="width:8%;min-width:10px;">操作</th>
+                    <th style="width:8%;min-width:10px;"> 操作</th>
                 </tr>
                 </thead>
 
@@ -108,88 +120,40 @@
                     <else />
                     <volist name="listData" id="data">
                         <tr>
-                            <td rowspan="{$data.row}">{$data.partner}</td>
+                            <td>{$data.partner_info.partner}</td>
-                            <td rowspan="{$data.row}">{$data.matche_platform}</td>
+                            <td>{$data.partner_info.matche_platform}</td>
-                            <td rowspan="{$data.row}">{$data.company_type}</td>
+                            <td>{$data.verify_type}</td>
-                            <notempty name="data.game">
+                            <td>{$data.partner_info.company_type}</td>
-                                <td rowspan="{$data['game'][0]['row']}">{$data['game'][0]['original_package_name']}</td>
+                            <td>{$data.contract_time}</td>
-                                <td rowspan="{$data['game'][0]['row']}">{$data['game'][0]['relation_game_name']}</td>
+                            <td>{$data.validity_time}</td>
-                                <td rowspan="{$data['game'][0]['row']}">{$data['game'][0]['game_type_name']}</td>
-                                <notempty name="data['game'][0]['game_ratio']">
-                                    <td>{$data['game'][0]['game_ratio'][0]['name']}</td>
-                                    <td>{$data['game'][0]['game_ratio'][0]['ratio']}%</td>
-                                <else />
-                                    <td >-</td>
-                                    <td>-</td>
-                                </notempty>  
-                            <else />
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                            </notempty>
 
-                            <td rowspan="{$data.row}">{$data.settlement_type}</td>
+                            <td>{$data.partner_info.channel_rate}%</td>
-                            <td rowspan="{$data.row}">{$data.payee_name}</td>
+                            <td>{$data.partner_info.invoice_rate}%</td>
-                            <td rowspan="{$data.row}">{$data.bank_account}</td>
+                            <td>{$data.partner_info.taxation_rate}%</td>
-                            <td rowspan="{$data.row}">{$data.opening_bank}</td>
-                            <td rowspan="{$data.row}">{$data.has_advance_charge}</td>
 
-                            <td rowspan="{$data.row}">{$data.is_collection}</td>
+                            <td>{$data.partner_info.payee_name}</td>
+                            <td>{$data.partner_info.bank_account}</td>
+                            <td>{$data.partner_info.opening_bank}</td>
 
-                            <td rowspan="{$data.row}">
+                            <td>{$data.create}</td>
-                                <a href="{:U('edit',array('id'=>$data['id']))}">编辑</a>
-                                <a href="{:U('edit',array('id'=>$data['id'],'action' => 'show'))}">查看</a>
-                                <a href="{:U('del',array('id'=>$data['id']))}" class="confirm ajax-get">删除</a>
-                            </td>
-                        </tr>
-                        <if condition="$data['game'][0]['row'] gt 1">
-                            <foreach name="data['game'][0]['game_ratio']" item="game_ratio" key="gamekey">
-                                <if condition="$gamekey gt 0">
-                                    <tr>
-                                        <td>{$game_ratio['name']}</td>
-                                        <td>{$game_ratio['ratio']}%</td>
-                                    </tr>
-                                </if>
-                            </foreach>
-                        </if>
-                        <notempty name="data['game'][1]">
                             
-                            <foreach name="data['game']" item="game" key="gkey">
+                            <td>
-                                <if condition="$gkey gt 0">
+                                <if condition="$data.verify_status eq -1 ">
-                                    <tr>
+                                    <div style="line-height: 2;color: red;">
-                                        <td rowspan="{$game['row']}">{$game['original_package_name']}</td>
+                                        {$data.verify}
-                                        <td rowspan="{$game['row']}">{$game['relation_game_name']}</td>
+                                    </div>
-                                        <td rowspan="{$game['row']}">{$game['game_type_name']}</td>
+                                <else /> 
-                                        <notempty name="game['game_ratio']">
+                                    <div style="line-height: 2;">
-                                            <td>{$game['game_ratio'][0]['name']}</td>
+                                        {$data.verify}
-                                            <td>{$game['game_ratio'][0]['ratio']}%</td>
+                                    </div>
-                                        <else />
-                                            <td >-</td>
-                                            <td>-</td>
-                                        </notempty>  
-                                    </tr>
-
-                                    <if condition="$game['row'] gt 1">
-                                        <foreach name="game['game_ratio']" item="game_ratio" key="gamekey">
-                                            <if condition="$gamekey gt 0">
-                                                <tr>
-                                                    <td>{$game_ratio['name']}</td>
-                                                    <td>{$game_ratio['ratio']}%</td>
-                                                </tr>
-                                            </if>
-                                        </foreach>
-                                    </if>
-
                                 </if>
-                            </foreach>
+                            </td>
-
+                            <td >
-                        </notempty>
+                                <a href="{:U('edit',array('id'=>$data['id'],'action' => 'show'))}">查看</a>
-
+                            </td>
-                    
+                        </tr> 
-                    </volist>
+                    </volist>     
-                </empty>
+                </empty>  
                 </tbody>
             </table>
         </div>

Data/update.sql

@@ -2095,18 +2095,18 @@ ADD COLUMN `change_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '推广员充
 
 --CP审核 cz
 ALTER TABLE `tab_partner`
-ADD COLUMN `taxation_rate`  decimal(5,2) NOT NULL DEFAULT '0.00' COMMENT '开票税点' AFTER `cooperation_status`;
+ADD COLUMN `taxation_rate`  decimal(5,2) NOT NULL DEFAULT '0.00' COMMENT '税费费率' AFTER `cooperation_status`;
 
 CREATE TABLE `tab_partner_verify` (
   `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
   `partner_id` int(11) NOT NULL COMMENT '0新增,其他修改',
   `partner_name` varchar(60) NOT NULL DEFAULT '' COMMENT '上游公司名称',
-  `partner_info` text NOT NULL COMMENT '公司信息',
+  `partner_info` text  COMMENT '公司信息',
-  `verify_status` tinyint(1) unsigned NOT NULL DEFAULT '1' COMMENT '状态 -1拒绝 0未审核 1审核通过',
+  `verify_status` tinyint(1) unsigned NOT NULL DEFAULT '0' COMMENT '状态 -1拒绝 0未审核 1审核通过',
   `create_admin_id` int(11) NOT NULL DEFAULT '0' COMMENT '添加人ID',
-  `create_admin_account` int(11) NOT NULL DEFAULT '0' COMMENT '添加人账号',
+  `create_admin_account` varchar(60) COMMENT '添加人账号',
   `create_time` int(11) NOT NULL DEFAULT '0' COMMENT '添加时间',
-  `verify_log` text NOT NULL COMMENT '审批相关信息json',
+  `verify_log` text  COMMENT '审批相关信息json',
   PRIMARY KEY (`id`),
   KEY `partner_id` (`partner_id`) USING BTREE,
   KEY `partner_name` (`partner_name`) USING BTREE,