Merge branch 'feature/cp_juhe_company' into hotfix/market_percentage

# Conflicts:
#	Application/Admin/Common/extend.php
#	Application/Admin/Controller/AggregateFinanceSetController.class.php
#	Application/Admin/Controller/CpJuheCompanyController.class.php
#	Application/Admin/View/CpJuheCompany/detail.html
#	Application/Admin/View/CpJuheCompany/export.html
#	Data/update.sql

Application/Admin/Controller/CpJuheCompanyController.class.php

@@ -44,14 +44,48 @@ class CpJuheCompanyController extends ThinkController {
         if($_REQUEST['export']) {
             $list_data = $data['data'];
             foreach ($list_data as $key => $value) {
+
+                if ($list_data[$key]['bank_card']){
+                    $list_data[$key]['bank_card'] = ' '.$list_data[$key]['bank_card'];
+                }
+
+                if ($list_data[$key]['alipay_user']) {
+                    $list_data[$key]['alipay_user'] = ' '.$list_data[$key]['alipay_user'];
+                }
+
                 $list_data[$key]['agreement_time'] = json_decode($list_data[$key]['agreement_time'],true);
                 $list_data[$key]['balance_time'] = json_decode($list_data[$key]['balance_time'],true);
 
-                $list_data[$key]['agreement_time']['start_time'] = date("Y-m-d H:i:s",$list_data[$key]['agreement_time']['start_time']);
-                ($list_data[$key]['agreement_time']['end_time']!=1)?($list_data[$key]['agreement_time']['end_time'] = date("Y-m-d H:i:s",$list_data[$key]['agreement_time']['end_time'])):($list_data[$key]['agreement_time']['end_time'] = "");
+//                $list_data[$key]['agreement_time']['start_time'] = date("Y-m-d",$list_data[$key]['agreement_time']['start_time']);
+//                ($list_data[$key]['agreement_time']['end_time']!=1)?($list_data[$key]['agreement_time']['end_time'] = date("Y-m-d",$list_data[$key]['agreement_time']['end_time'])):($list_data[$key]['agreement_time']['end_time'] = "");
+//
+//                $list_data[$key]['balance_time']['start_time'] = date("Y-m-d",$list_data[$key]['balance_time']['start_time']);
+//                ($list_data[$key]['balance_time']['end_time']!=1)?($list_data[$key]['balance_time']['end_time'] = date("Y-m-d",$list_data[$key]['balance_time']['end_time'])):($list_data[$key]['balance_time']['end_time'] = "");
+
+                if ($list_data[$key]['agreement_time']['start_time']) {
+                    $list_data[$key]['agreement_time']['start_time'] = date("Y-m-d", $list_data[$key]['agreement_time']['start_time']);
+                } else {
+                    $list_data[$key]['agreement_time']['start_time'] = "未设置";
+                }
+
+                if($list_data[$key]['agreement_time']['end_time']) {
+                    ($list_data[$key]['agreement_time']['end_time'] != 1) ? ($list_data[$key]['agreement_time']['end_time'] = date("Y-m-d", $list_data[$key]['agreement_time']['end_time'])) : ($list_data[$key]['agreement_time']['end_time'] = "");
+                } else {
+                    $list_data[$key]['agreement_time']['end_time'] = "未设置";
+                }
+
+                if ($list_data[$key]['balance_time']['start_time']) {
+                    $list_data[$key]['balance_time']['start_time'] = date("Y-m-d", $list_data[$key]['balance_time']['start_time']);
+                } else {
+                    $list_data[$key]['balance_time']['start_time'] = "未设置";
+                }
+
+                if($list_data[$key]['balance_time']['end_time']) {
+                    ($list_data[$key]['balance_time']['end_time'] != 1) ? ($list_data[$key]['balance_time']['end_time'] = date("Y-m-d", $list_data[$key]['balance_time']['end_time'])) : ($list_data[$key]['balance_time']['end_time'] = "");
+                } else {
+                    $list_data[$key]['balance_time']['end_time'] = "未设置";
+                }
 
-                $list_data[$key]['balance_time']['start_time'] = date("Y-m-d H:i:s",$list_data[$key]['balance_time']['start_time']);
-                ($list_data[$key]['balance_time']['end_time']!=1)?($list_data[$key]['balance_time']['end_time'] = date("Y-m-d H:i:s",$list_data[$key]['balance_time']['end_time'])):($list_data[$key]['balance_time']['end_time'] = "");
             }
 
             $this->assign("listdata",$list_data);
@@ -74,8 +108,8 @@ class CpJuheCompanyController extends ThinkController {
     public function detail() {
 
         $_REQUEST['id']?($request['id'] = $_REQUEST['id']):'';
-
-        $data = json_decode(curl_post("http://10.0.1.161:8095/index.php?g=Api&m=CpJuheCompany&a=detail",$request),true);
+        $url = M("kv")->field("value")->where(['key'=>"cp_company_detail_api"])->find();
+        $data = json_decode(curl_post($url['value'],$request),true);
 
         $this->assign("data",$data);
         $this->display();

Application/Admin/View/CpJuheCompany/detail.html

@@ -132,7 +132,7 @@
                         <tr>
                             <td class="l noticeinfo">注册地址</td>
                             <td class="r">
-                                <span class="form-required" style="line-height: 30px;">{$data['register_address']}%</span>
+                                <span class="form-required" style="line-height: 30px;">{$data['register_address']}</span>
                             </td>
                         </tr>
 
@@ -180,7 +180,7 @@
                                 <span class="form-required" style="line-height: 30px;"><if condition="$data['is_service'] eq 0">否<else/>是</if></span>
                                 <!--						<input readonly type="radio" name="is_service" style="margin-top: -2px;" autocomplete="off" placeholder="开始时间" value="1" <if condition="$data['is_service'] eq 1">checked</if>><span style="margin-top: 7px;display: inline-block;">是</span>-->
                                 <!--						<input readonly type="radio" name="is_service" style="margin-top: -2px;margin-left: 30px" autocomplete="off" placeholder="结束时间" value="0" <if condition="$data['is_service'] eq 0">checked</if>><span>否</span>-->
-                                <span class="form-required" style="line-height: 30px;">{$data['service_cost']}</span>
+                                <span class="form-required" style="line-height: 30px;">服务费:{$data['service_cost']}</span>
                                 <!--						<input readonly type="text" name="service_cost" value="{$data['service_cost']}" onkeyup ="value=value.replace(/[^\d]/g,'')" style="margin-left: 30px">-->
                                 &nbsp;&nbsp;元
                             </td>

Application/Admin/View/CpJuheCompany/export.html

@@ -112,6 +112,9 @@
           <th >是否有预付款</th>
           <th >预付款金额</th>
           <th >是否签署合同</th>
+
+          <th >是否具有游戏资质</th>
+
           <th >合同期限</th>
           <th >生效时间</th>
           <th >开票税点</th>
@@ -157,11 +160,14 @@
               <td rowspan="{$vo.rowspan}">{$vo.is_surplus|default="否"}</td>
               <td rowspan="{$vo.rowspan}">{$vo.before_amount|default="0"}</td>
               <td rowspan="{$vo.rowspan}">{$vo.is_contract|default="------"}</td>
+
+              <td rowspan="{$vo.rowspan}">{$vo.is_qualifity|default="否"}</td>
+
               <td rowspan="{$vo.rowspan}">
-                <span class="form-required" style="line-height: 30px;">{$vo['agreement_time']['start_time']}</span>&nbsp;&nbsp;—&nbsp;&nbsp;
+                <span class="form-required" style="line-height: 30px;">{$vo['agreement_time']['start_time']}</span>—
                 <span class="form-required" style="line-height: 30px;">{$vo['agreement_time']['end_time']|default="永久"}</span></td>
               <td rowspan="{$vo.rowspan}">
-                <span class="form-required" style="line-height: 30px;">{$vo['balance_time']['start_time']}</span>&nbsp;&nbsp;—&nbsp;&nbsp;
+                <span class="form-required" style="line-height: 30px;">{$vo['balance_time']['start_time']}</span>—
                 <span class="form-required" style="line-height: 30px;">{$vo['balance_time']['end_time']|default="永久"}</span>
               </td>
               <td rowspan="{$vo.rowspan}">{$vo['tax_point']}%</td>

Data/update.sql

@@ -2185,3 +2185,6 @@ ALTER TABLE `sj_game_channel`.`sj_cptogether_company`
 ADD COLUMN `is_received` tinyint(2) NULL DEFAULT 0 COMMENT '是否为收款方' AFTER `connection_address`;
 
 INSERT INTO `sys_kv`(`id`, `key`, `value`, `type`, `remark`) VALUES (4, 'cp_company_api', 'http://10.0.1.161:8095/index.php?g=Api&m=CpJuheCompany&a=index', 'string', '聚合公司网址')
+
+ALTER TABLE `sj_game_channel`.`sj_cptogether_company`
+ADD COLUMN `is_qualifity` tinyint(2) NULL COMMENT '是否具有游戏资质 0 否 1 是' AFTER `is_received`;