Merge branch 'fix/change_statement_time' of wmtx/platform into release

Application/Admin/Common/extend.php

@@ -2049,7 +2049,7 @@ function excelDownStreamTemplate($data, $all_sum_money, $all_pay_amount, $big_al
     $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+5), $data['receive_company']['link_phone']);//联系电话
     $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+6), $data['receive_company']['address']);//邮寄地址
 //    $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+8), $value['pay_amount']);//请汇入此账号
-    $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+8), $data['receive_company']['bank_account_name']);//户名
+    $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+8), $data['receive_company']['payee_name']);//户名
     $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+9), $data['receive_company']['bank_account']);//银行账号
     $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+10), $data['receive_company']['opening_bank']);//开户行
 

Application/Admin/Controller/CompanyStatementSetController.class.php

@@ -526,7 +526,7 @@ class CompanyStatementSetController extends Controller {
 			"company_type"=>1
 		];
 		//获取pc公司
-		$tmpp = M("PromoteCompany","tab_")->field("id,uid,company_name partner,settlement_contact link_man,contact_phone link_phone,bank_name opening_bank,bank_address payee_name,bank_card bank_account,fax_ratio,taxation_rate,company_belong,company_type,ali_user,ali_account,has_server_fee,server_fee,has_ratio,turnover_ratio")
+		$tmpp = M("PromoteCompany","tab_")->field("id,uid,company_name partner,settlement_contact link_man,address,contact_phone link_phone,bank_name opening_bank,bank_address payee_name,bank_card bank_account,fax_ratio,taxation_rate,company_belong,company_type,ali_user,ali_account,has_server_fee,server_fee,has_ratio,turnover_ratio")
 				->where($pc_map)
 				->select();
 		if(empty($tmpp)){

Application/Admin/Controller/PartnerController.class.php

@@ -163,21 +163,22 @@ class PartnerController extends ThinkController
             }
             $value['has_server_fee'] = $value['has_server_fee'] ? '是' : '否';
             $value['cooperation_status'] = $value['cooperation_status'] ? '合作中' : '暂停合作';
-            
-
-            
-
             $value['company_type'] = $value['company_type'] == 2 ? '个人' : '公司';
-            $contract_start_time = $value['contract_start_time'] ?
+
-                time_format($value['contract_start_time'], 'Y/m/d') : '-';
+            $contract_start_time = $value['contract_start_time'] ? time_format($value['contract_start_time'], 'Y/m/d') : '-';
-            $contract_end_time = $value['contract_end_time'] ?
+            if($value['contract_start_time']){
-                time_format($value['contract_end_time'], 'Y/m/d') : '-';
+                $contract_end_time = $value['contract_end_time'] ? date('Y/m/d', $value['contract_end_time']) : '永久';
+            }else{
+                $contract_end_time = $value['contract_end_time'] ? time_format($value['contract_end_time'], 'Y/m/d') : '-';
+            }
             $value['contract_time'] = $contract_start_time . '-' . $contract_end_time;
 
-            $validity_start_time = $value['validity_start_time'] ?
+            $validity_start_time = $value['validity_start_time'] ? time_format($value['validity_start_time'], 'Y/m/d') : '-';
-                time_format($value['validity_start_time'], 'Y/m/d') : '-';
+            if($value['validity_start_time']){
-            $validity_end_time = $value['validity_end_time'] ?
+                $validity_end_time = $value['validity_end_time'] ? date('Y/m/d', $value['validity_end_time']) : '永久';
-                time_format($value['validity_end_time'], 'Y/m/d') : '-';
+            }else{
+                $validity_end_time = $value['validity_end_time'] ? time_format($value['validity_end_time'], 'Y/m/d') : '-';
+            }
             $value['validity_time'] = $validity_start_time . '-' . $validity_end_time;
             
             $row2 = array_sum(array_column($value['game'], 'row')) ;
@@ -192,7 +193,6 @@ class PartnerController extends ThinkController
             $this->display("export");
             die();
         }
-
         /* 查询记录总数 */
         $count = $model
             ->where($map)
@@ -261,17 +261,25 @@ class PartnerController extends ThinkController
             }
             $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_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'] ?
+            if($v['partner_info']['contract_start_time']){
-                time_format($v['partner_info']['contract_end_time'], 'Y/m/d') : '-';
+                $contract_end_time = $v['partner_info']['contract_end_time'] ? date('Y/m/d', $v['partner_info']['contract_end_time']) : '永久';
+            }else{
+                $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') : '-';
+            if($v['partner_info']['validity_start_time']){
+                $validity_end_time = $v['partner_info']['validity_end_time'] ? date('Y/m/d', $v['partner_info']['validity_end_time']) : '永久';
+            }else{
+                $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['verify_log'] = json_decode($v['verify_log'], true);

Application/Admin/Controller/PromoteCompanyController.class.php

@@ -121,17 +121,24 @@ class PromoteCompanyController extends ThinkController
                 $v["develop_type"] = getCompanyRelation($v["develop_type"]);
                 $v['company_type'] = $v['company_type'] == 2 ? '个人' : '公司';
                 $v['is_sign_contact'] = $v['is_sign_contact'] ? '是' : '否';
-                $contract_start_time = $v['contact_begin'] ?
+
-                    time_format($v['contact_begin'], 'Y/m/d') : '-';
+                $contract_start_time = $v['contact_begin'] ? time_format($v['contact_begin'], 'Y/m/d') : '-';
-                $contract_end_time = $v['contact_end'] ?
+                if($v['contact_begin']){
-                    time_format($v['contact_end'], 'Y/m/d') : '-';
+                    $contract_end_time = $v['contact_end'] ? date('Y/m/d', $v['contact_end']) : '永久';
+                }else{
+                    $contract_end_time = $v['contact_end'] ? time_format($v['contact_end'], 'Y/m/d') : '-';
+                }
                 $v['contract_time'] = $contract_start_time . '-' . $contract_end_time;
 
-                $validity_start_time = $v['validity_start_time'] ?
+                $validity_start_time = $v['validity_start_time'] ? time_format($v['validity_start_time'], 'Y/m/d') : '-';
-                    time_format($v['validity_start_time'], 'Y/m/d') : '-';
+                if($v['validity_start_time']){
-                $validity_end_time = $v['validity_end_time'] ?
+                    $validity_end_time = $v['validity_end_time'] ? date('Y/m/d', $v['validity_end_time']) : '永久';
-                    time_format($v['validity_end_time'], 'Y/m/d') : '-';
+                }else{
+                    $validity_end_time = $v['validity_end_time'] ? time_format($v['validity_end_time'], 'Y/m/d') : '-';
+                }
                 $v['validity_time'] = $validity_start_time . '-' . $validity_end_time;
+
+
                 if(!$is_export){
                     $v['can_del'] = $this->promoteCompanyIsCanDel($v["id"]) ? 1 : 0;
                 }
@@ -238,15 +245,23 @@ class PromoteCompanyController extends ThinkController
 
             $contract_start_time = $v['company_info']['contact_begin'] ?
                 time_format($v['company_info']['contact_begin'], 'Y/m/d') : '-';
-            $contract_end_time = $v['company_info']['contact_end'] ?
+            if($v['company_info']['contact_begin']){
-                time_format($v['company_info']['contact_end'], 'Y/m/d') : '-';
+                $contract_end_time = $v['company_info']['contact_end'] ? date('Y/m/d', $v['company_info']['contact_end']) : '永久';
+            }else{
+                $contract_end_time = $v['company_info']['contact_end'] ? time_format($v['company_info']['contact_end'], 'Y/m/d') : '-';
+            }
             $v['contract_time'] = $contract_start_time . '-' . $contract_end_time;
 
             $validity_start_time = $v['company_info']['validity_start_time'] ?
                 time_format($v['company_info']['validity_start_time'], 'Y/m/d') : '-';
-            $validity_end_time = $v['company_info']['validity_end_time'] ?
+
-                time_format($v['company_info']['validity_end_time'], 'Y/m/d') : '-';
+            if($v['company_info']['validity_start_time']){
+                $validity_end_time = $v['company_info']['validity_end_time'] ? date('Y/m/d', $v['company_info']['validity_end_time']) : '永久';
+            }else{
+                $validity_end_time = $v['company_info']['validity_end_time'] ? time_format($v['company_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['verify_log'] = json_decode($v['verify_log'], true);