elf
/
cf-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request '云中如梦令 扶持' (#617) from feature/yzrml_testing into master

Browse Source 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/617
master
张谷城 3 years ago
parent 738b54e5b3 588fb81c1e
commit 8313580aef
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File

7
Application/Admin/Controller/PromoteCompanyWarningController.class.php
Unescape Escape View File

@ -29,7 +29,7 @@ class PromoteCompanyWarningController extends ThinkController
$month = I('month', ''); $month = I('month', '');
$companyId = I('company_id', 0); $companyId = I('company_id', 0);
$isExport = I('is_export', 0); $isExport = I('is_export', 0);
$isSignContact = I('is_sign_contact', -1); $isSignContact = I('is_sign_contact', 0);
$where = [ $where = [
'_string' => '1=1 and b.company_id is not null', '_string' => '1=1 and b.company_id is not null',
'c.company_belong' => ['in', [1, 2]], 'c.company_belong' => ['in', [1, 2]],
@ -47,9 +47,10 @@ class PromoteCompanyWarningController extends ThinkController
$monthNumber = date('Ym', strtotime($month.'-01')); $monthNumber = date('Ym', strtotime($month.'-01'));
$where['b.month'] = $monthNumber; $where['b.month'] = $monthNumber;
} }
$where['c.cooperation_status'] = 1;
$joinDataTable = 'tab_company_monthly_data'; $joinDataTable = 'tab_company_monthly_data';
$columns = ['b.company_id', 'c.company_name', 'c.is_sign_contact', 'b.pay_amount']; $columns = ['b.company_id', 'c.company_name', 'c.is_sign_contact', 'b.pay_amount', 'c.cooperation_status'];
$orderBy = 'b.company_id asc'; $orderBy = 'b.company_id asc';
if ($type == 'total') { if ($type == 'total') {
$subSql = M('company_monthly_data', 'tab_')->field('company_id')->where(['is_warning' => 1])->select(false); $subSql = M('company_monthly_data', 'tab_')->field('company_id')->where(['is_warning' => 1])->select(false);
@ -101,6 +102,7 @@ class PromoteCompanyWarningController extends ThinkController
foreach ($items as $key => $item) { foreach ($items as $key => $item) {
$item['month'] = date('Y-m', strtotime($item['month'].'01')); $item['month'] = date('Y-m', strtotime($item['month'].'01'));
$item['is_sign_contact_text'] = $item['is_sign_contact'] == 1 ? '是' : '否'; $item['is_sign_contact_text'] = $item['is_sign_contact'] == 1 ? '是' : '否';
$item['cooperation_status_text'] = $item['cooperation_status'] == 1 ? '合作中' : '终止合作';
$itemPromotes = $companyPromotes[$item['company_id']]; $itemPromotes = $companyPromotes[$item['company_id']];
$promoteCount = count($itemPromotes); $promoteCount = count($itemPromotes);
$index = 0; $index = 0;
@ -125,6 +127,7 @@ class PromoteCompanyWarningController extends ThinkController
$item['month'] = date('Y-m', strtotime($item['month'].'01')); $item['month'] = date('Y-m', strtotime($item['month'].'01'));
} }
$item['is_sign_contact_text'] = $item['is_sign_contact'] == 1 ? '是' : '否'; $item['is_sign_contact_text'] = $item['is_sign_contact'] == 1 ? '是' : '否';
$item['cooperation_status_text'] = $item['cooperation_status'] == 1 ? '合作中' : '终止合作';
$itemPromotes = $companyPromotes[$item['company_id']]; $itemPromotes = $companyPromotes[$item['company_id']];
$promoteCount = count($itemPromotes); $promoteCount = count($itemPromotes);
$index = 0; $index = 0;

8
Application/Admin/View/PromoteCompanyWarning/records.html
Unescape Escape View File

@ -104,7 +104,7 @@
<div class="input-list input-list-promote search_label_rehab"> <div class="input-list input-list-promote search_label_rehab">
<select name="is_sign_contact" class="select_gallery" style="width:120px;"> <select name="is_sign_contact" class="select_gallery" style="width:120px;">
<option value="-1">是否签约</option> <option value="-1">是否签约</option>
<option value="0">否</option> <option value="0" selected>否</option>
<option value="1">是</option> <option value="1">是</option>
</select> </select>
</div> </div>
@ -128,13 +128,16 @@
<thead> <thead>
<tr> <tr>
<th>合作方名称</th> <th>合作方名称</th>
<th>流水金额</th> <th> <?php if ($pageType=='total'):?>
累计
<?php endif;?>流水金额</th>
<?php if ($pageType=='monthly'):?> <?php if ($pageType=='monthly'):?>
<th>达标月份</th> <th>达标月份</th>
<?php endif;?> <?php endif;?>
<th>会长账号</th> <th>会长账号</th>
<th>市场专员</th> <th>市场专员</th>
<th>所属市场部</th> <th>所属市场部</th>
<th>合作关系</th>
<th>是否签约</th> <th>是否签约</th>
</tr> </tr>
</thead> </thead>
@ -156,6 +159,7 @@
<td>{$data.account}</td> <td>{$data.account}</td>
<td>{$data.market_user_name}</td> <td>{$data.market_user_name}</td>
<td>{$data.market_department_name}</td> <td>{$data.market_department_name}</td>
<td>{$data.cooperation_status_text}</td>
<?php if($data['rowspan']>0):?> <?php if($data['rowspan']>0):?>
<td rowspan="{$data.rowspan}">{$data.is_sign_contact_text}</td> <td rowspan="{$data.rowspan}">{$data.is_sign_contact_text}</td>
<?php endif;?> <?php endif;?>

2
Application/Base/Tool/GameResource.class.php
Unescape Escape View File

@ -47,6 +47,8 @@ class GameResource
300 => ZxjClient::class, // 诛神记(苹果版) 300 => ZxjClient::class, // 诛神记(苹果版)
303 => SlzqClient::class, // 神灵之契(安卓版) 303 => SlzqClient::class, // 神灵之契(安卓版)
304 => SlzqClient::class, // 神灵之契(苹果版) 304 => SlzqClient::class, // 神灵之契(苹果版)
307 => LeyouClient::class, // 云中如梦令(安卓版)
308 => LeyouClient::class, // 云中如梦令(苹果版)
]; ];
public function __construct($game) public function __construct($game)

Write Preview
Loading…
Cancel
Save