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

Merge branch 'feature/yibao_company' into release

Browse Source 
# Conflicts:
#	Application/Admin/Common/extend.php
master
liuweiwen 5 years ago
parent ae29e6ef53 5d596094a6
commit 969bf4dc8a
12 changed files with 66 additions and 145 deletions
Show Stats Download Patch File Download Diff File

118
Application/Admin/Common/extend.php
Unescape Escape View File

@ -267,6 +267,7 @@ function all_pay_way($type=false)
/* $pay_way[6]=array('key'=>7,'value'=>"苹果支付");
*/
$pay_way[15]=array('key'=>15,'value'=>'双乾支付-快捷');
$pay_way[17]=array('key'=>17,'value'=>'易宝支付');
return $pay_way;
}
/* //获取支付方式 */
@ -314,7 +315,6 @@ function get_pay_way($id=null)
break;
case 15:
return "双乾支付-快捷";
break;
case 17:
return "易宝支付";
break;
@ -1491,6 +1491,7 @@ function cash_pay_way()
$pay_way[9]=array('key'=>9,'value'=>"双乾支付-支付宝");
$pay_way[10]=array('key'=>10,'value'=>"双乾支付-银联");
$pay_way[15]=array('key'=>15,'value'=>'双乾支付-快捷');
$pay_way[17]=array('key'=>17,'value'=>'易宝支付');
return $pay_way;
}
@ -1549,6 +1550,9 @@ function getPayType($type) {
case 15:
$return = '双乾支付-快捷';
break;
case 17:
$return = '易宝支付';
break;
default:
$return = '未知';
break;
@ -1821,7 +1825,7 @@ function all_pay_way_other($type=false)
/* $pay_way[6]=array('key'=>7,'value'=>"苹果支付");
*/
$pay_way[15]=array('key'=>15,'value'=>'双乾支付-快捷');
$pay_way[17]=array('key'=>17,'value'=>"易宝支付");
$pay_way[17]=array('key'=>17,'value'=>'易宝支付');
return $pay_way;
}
@ -2202,114 +2206,4 @@ function a_array_unique($array){
return $data;
}
}
/**
* 操作日志
* array(
* op_type=>操作类型 0:新增，1:编辑 2:删除 3:下载,
* op_name=>操作说明 例如:编辑,删除,锁定等,
* url=>需要跳转的url 添加去列表加唯一id，编辑直接去编辑页面，下载可以重新下载(新开页面),
* key=>关键词:用户的账号，游戏的名词等,
* menu=>非必须，菜单目录，不存在的话按控制器寻找
* )
*/
function addOperationLog($options)
{
$checkarr = ['op_type','url','key'];
foreach ($checkarr as $v) {
if(!array_key_exists($v,$options)){
return false;
}
}
if(!array_key_exists("op_name",$options)){
$options['op_name'] = ($options['op_type'] == 1 ? "编辑" : ($options['op_type'] == 2 ? "删除" :($options['op_type'] == 3 ? "导出" :"新增")));
}
//获取ip
$addarray = [
"op_ip"=>$_SERVER['REMOTE_ADDR'],
'admin_id'=>$_SESSION['onethink_admin']['user_auth']['uid'],
'admin_account'=>$_SESSION['onethink_admin']['user_auth']['username'],
'op_type'=>$options['op_type'],
'op_name'=>$options['op_name'],
'url'=>$options['url'],
'key'=>$options['key'],
'create_time'=>time()
];
//获取菜单名称
if(!array_key_exists("menu",$options)){
$act = CONTROLLER_NAME.'/'.ACTION_NAME;
$arr = [];
$menuname = D("menu")->field('title,pid,group')->where("url = '{$act}'")->find();
if($menuname){
$arr[] = $menuname['title'];
if(!empty($menuname['group'])){
$arr[] = $menuname['group'];
}
getLink($menuname['pid'],$arr);
}
$addarray['menu'] = implode ( "-",array_reverse($arr));
}else{
$addarray['menu'] = $options['menu'];
}
M("OperationLog","tab_")->add($addarray);
}
function getLink($pid=0,&$arr){
if($pid == 0){
return;
}
$menuname = D("menu")->field('title,pid,group')->where("id = '{$pid}'")->find();
if($menuname){
$arr[] = $menuname['title'];
if(!empty($menuname['group'])){
$arr[] = $menuname['group'];
}
if($menuname['pid'] != 0){
getLink($menuname['pid'], $arr);
}
}
}
function getNowDate() {
return date('YmdHis',time());
}
//根据推广员id获取推广员姓名
function getPromoteName($id) {
if (!$id) {
return '';
}
$name = M('promote','tab_')
->where(['id'=>$id])
->find()['account'];
return $name;
}
//根据关联id获取游戏名称
function getrelationGameName($id) {
if (!$id) {
return '';
}
$name = M('game','tab_')
->where(['relation_game_id'=>$id])
->find()['relation_game_name'];
return $name;
}
?>

3
Application/Admin/Controller/FinancialSummaryController.class.php
Unescape Escape View File

@ -22,7 +22,8 @@ class FinancialSummaryController extends AdminController
"sqkj_count"=>"双乾-快捷",
"wx_count"=>"微信",
"zfb_count"=>"支付宝",
"kj_count"=>"快捷"
"kj_count"=>"快捷",
"ybzf_count"=>"易宝支付",
);
public function _initialize()
{

34
Application/Admin/Controller/FinancialSummarySetController.class.php
Unescape Escape View File

@ -334,7 +334,8 @@ class FinancialSummarySetController extends \Think\Controller
"zfb"=>0,
"gfzfb"=>0,
"sqzfb"=>0,
"sqkj"=>0
"sqkj"=>0,
"ybzf"=>0,
];
$this->getSpendPayWay($moneyarry);
$this->getGameSupersignPayWay($moneyarry);
@ -377,13 +378,24 @@ class FinancialSummarySetController extends \Think\Controller
"type"=>5,"sort"=>3,
"sum_money"=>number_format($moneyarry['sqkj']/100, 2, '.', '')
);
$this->adddata[] = array(
"key_name"=>'ybzf_count',
"type"=>4,"sort"=>5,
"sum_money"=>number_format($moneyarry['ybzf']/100, 2, '.', '')
);
$this->adddata[] = array(
"key_name"=>'ybzf_count',
"type"=>5,"sort"=>4,
"sum_money"=>number_format($moneyarry['ybzf']/100, 2, '.', '')
);
echo 'success';
}
//获取spend表
protected function getSpendPayWay(&$moneyarry){
$map = array(
"pay_time"=> array('BETWEEN',array($this->beginThismonth, $this->endThismonth)),
"pay_status"=>1,
"pay_way"=>array("IN","1,2,3,9,15")
"pay_way"=>array("IN","1,2,3,9,15,17")
);
$dbres=$this->SpendModel
->field("
@ -391,7 +403,8 @@ class FinancialSummarySetController extends \Think\Controller
IFNULL(SUM(CASE WHEN pay_way = 3 THEN pay_amount ELSE 0 END),0) as wxapp_count,
IFNULL(SUM(CASE WHEN pay_way = 1 THEN pay_amount ELSE 0 END),0) as zfbgf_count,
IFNULL(SUM(CASE WHEN pay_way = 9 THEN pay_amount ELSE 0 END),0) as zfbsq_count,
IFNULL(SUM(CASE WHEN pay_way = 15 THEN pay_amount ELSE 0 END),0) as kjsq_count
IFNULL(SUM(CASE WHEN pay_way = 15 THEN pay_amount ELSE 0 END),0) as kjsq_count,
IFNULL(SUM(CASE WHEN pay_way = 17 THEN pay_amount ELSE 0 END),0) as ybzf_count
")
->where($map)
->find();
@ -399,6 +412,7 @@ class FinancialSummarySetController extends \Think\Controller
$moneyarry['gfzfb'] += $dbres['zfbgf_count']*100;
$moneyarry['sqzfb'] += $dbres['zfbsq_count']*100;
$moneyarry['sqkj'] += $dbres['kjsq_count']*100;
$moneyarry['ybzf'] += $dbres['ybzf_count']*100;
}
//获取超级签购买
protected function getGameSupersignPayWay(&$moneyarry)
@ -410,12 +424,14 @@ class FinancialSummarySetController extends \Think\Controller
$dbres=$this->GameSupersignModel
->field("
IFNULL(SUM(CASE WHEN pay_way = 2 THEN pay_price ELSE 0 END),0) as wx_count,
IFNULL(SUM(CASE WHEN pay_way = 1 THEN pay_price ELSE 0 END),0) as zfb_count
IFNULL(SUM(CASE WHEN pay_way = 1 THEN pay_price ELSE 0 END),0) as zfb_count,
IFNULL(SUM(CASE WHEN pay_way = 1 THEN pay_price ELSE 0 END),0) as ybzf_count
")
->where($map)
->find();
$moneyarry['wx'] += $dbres['wx_count']*100;
$moneyarry['gfzfb'] += $dbres['zfb_count']*100;
$moneyarry['ybzf'] += $dbres['ybzf_count']*100;
}
//玩家购买平台币
protected function getDepositPayWay(&$moneyarry)
@ -423,7 +439,7 @@ class FinancialSummarySetController extends \Think\Controller
$map = array(
"create_time"=> array('BETWEEN',array($this->beginThismonth, $this->endThismonth)),
"pay_status"=>1,
"pay_way"=>array("IN","1,2,3,9,15")
"pay_way"=>array("IN","1,2,3,9,15,17")
);
$dbres=$this->DepositModel
->field("
@ -431,7 +447,8 @@ class FinancialSummarySetController extends \Think\Controller
IFNULL(SUM(CASE WHEN pay_way = 3 THEN pay_amount ELSE 0 END),0) as wxapp_count,
IFNULL(SUM(CASE WHEN pay_way = 1 THEN pay_amount ELSE 0 END),0) as zfbgf_count,
IFNULL(SUM(CASE WHEN pay_way = 9 THEN pay_amount ELSE 0 END),0) as zfbsq_count,
IFNULL(SUM(CASE WHEN pay_way = 15 THEN pay_amount ELSE 0 END),0) as kjsq_count
IFNULL(SUM(CASE WHEN pay_way = 15 THEN pay_amount ELSE 0 END),0) as kjsq_count,
IFNULL(SUM(CASE WHEN pay_way = 17 THEN pay_amount ELSE 0 END),0) as ybzf_count
")
->where($map)
->find();
@ -439,6 +456,7 @@ class FinancialSummarySetController extends \Think\Controller
$moneyarry['gfzfb'] += $dbres['zfbgf_count']*100;
$moneyarry['sqzfb'] += $dbres['zfbsq_count']*100;
$moneyarry['sqkj'] += $dbres['kjsq_count']*100;
$moneyarry['ybzf'] += $dbres['ybzf_count']*100;
}
//会长充值平台币
protected function getCoinPayOrderPayWay(&$moneyarry)
@ -450,12 +468,14 @@ class FinancialSummarySetController extends \Think\Controller
$dbres= $this->CoinPayOrderModel
->field("
IFNULL(SUM(CASE WHEN pay_way = 2 THEN pay_amount ELSE 0 END),0) as wx_count,
IFNULL(SUM(CASE WHEN pay_way = 1 THEN pay_amount ELSE 0 END),0) as zfb_count
IFNULL(SUM(CASE WHEN pay_way = 1 THEN pay_amount ELSE 0 END),0) as zfb_count,
IFNULL(SUM(CASE WHEN pay_way = 17 THEN pay_amount ELSE 0 END),0) as ybzf_count
")
->where($map)
->find();
$moneyarry['wx'] += $dbres['wx_count']*100;
$moneyarry['gfzfb'] += $dbres['zfb_count']*100;
$moneyarry['ybzf'] += $dbres['ybzf_count']*100;
}
public function addDb()
{

3
Application/Admin/Controller/OldCountController.class.php
Unescape Escape View File

@ -1,5 +1,6 @@
<?php
use Admin\FinancialSummarySetController;
//use Admin\FinancialSummarySetController;
namespace Admin\Controller;
/**

1
Application/Admin/View/Finance/gameStatisticsDetail.html
Unescape Escape View File

@ -84,6 +84,7 @@
<option value="15">双乾支付-快捷</option>
<option value="0">平台币</option>
<option value="-1">绑币</option>
<option value="17">易宝支付</option>
</select>
</div>

1
Application/Admin/View/FinancePromote/gameStatisticsDetail.html
Unescape Escape View File

@ -137,6 +137,7 @@
<option value="15">双乾支付-快捷</option>
<option value="0">平台币</option>
<option value="-1">绑币</option>
<option value="17">易宝支付</option>
</select>
</div>

1
Application/Admin/View/PayChannel/testDetail.html
Unescape Escape View File

@ -91,6 +91,7 @@
<option value="15">双乾支付-快捷</option>
<option value="0">平台币</option>
<option value="-1">绑币</option>
<option value="17">易宝支付</option>
</select>
</div>

2
Application/Admin/View/Promote/spend_list.html
Unescape Escape View File

@ -124,7 +124,7 @@
<div class="input-list input-list-spend search_label_rehab">
<select id="pay_way_id" name="pay_way" class="select_gallery" style="width:120px;">
<option value="">充值方式</option>
<volist name=":all_pay_way(1)" id="vo">
<volist name=":all_pay_way_other(1)" id="vo">
<option value="{$vo.key}">{$vo.value}</option>
</volist>
</select>

24
Application/Admin/View/PromoteCompany/add.html
Unescape Escape View File

@ -94,7 +94,7 @@
</td>
</tr>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>是否签署合同:</td>
<td class="l">是否签署合同:</td>
<td class="r" >
<div class="input-list input-list-server search_label_rehab" style="margin:0;">
<select id="is_sign_contact" name="is_sign_contact" class="select_gallery" style="width: 215px;">
@ -133,13 +133,13 @@
</td>
</tr>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>所在地址：</td>
<td class="l">所在地址：</td>
<td class="r" >
<input type="text" class="txt " name="address" value="" placeholder="请输入所在地址">
</td>
</tr>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>银行卡号：</td>
<td class="l">银行卡号：</td>
<td class="r" >
<input type="text" class="txt " name="bank_card" value="" placeholder="请输入银行卡号">
</td>
@ -151,13 +151,13 @@
</td>
</tr> -->
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>收款银行：</td>
<td class="l">收款银行：</td>
<td class="r" >
<input type="text" class="txt " name="bank_name" value="" placeholder="请输入收款银行">
</td>
</tr>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>开户网点：</td>
<td class="l">开户网点：</td>
<td class="r" >
<input type="text" class="txt " name="bank_address" value="" placeholder="请输入开户网点">
</td>
@ -287,18 +287,18 @@
var obj = {
"company_name":["required","推广公司名称不允许为空"],
"platform_name":["nocheck"],
"contact_begin":["date","合同开始时间不能为空"],
"contact_end":["date","合同结束时间不能为空"],
// "contact_begin":["date","合同开始时间不能为空"],
// "contact_end":["date","合同结束时间不能为空"],
"fax_ratio":["number","开票税率必须是数字，如果无此项请填0"],
"company_type":["required","公司性质不能为空","select"],
"is_sign_contact":["required","是否签署合同项不能为空","select"],
// "is_sign_contact":["required","是否签署合同项不能为空","select"],
"company_belong":["required","团体归属不能为空","select"],
"settlement_contact":["required","结算联系人不能为空"],
"contact_phone":["phone","联系人电话格式不对或不能为空"],
"address":["required","联系人地址不能为空"],
"bank_card":["bankid","银行卡格式错误或不能为空"],
"bank_name":["required","银行名称不能为空"],
"bank_address":["required","银行开户网点不能为空"],
// "address":["required","联系人地址不能为空"],
// "bank_card":["bankid","银行卡格式错误或不能为空"],
// "bank_name":["required","银行名称不能为空"],
// "bank_address":["required","银行开户网点不能为空"],
"content":["nocheck"],
"status":["nocheck","","radio"]
}

22
Application/Admin/View/PromoteCompany/edit.html
Unescape Escape View File

@ -96,7 +96,7 @@
</td>
</tr>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>是否签署合同:</td>
<td class="l">是否签署合同:</td>
<td class="r" >
<div class="input-list input-list-server search_label_rehab" style="margin:0;">
<select id="is_sign_contact" name="is_sign_contact" class="select_gallery" style="width: 215px;">
@ -141,13 +141,13 @@
</td>
</tr>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>所在地址：</td>
<td class="l">所在地址：</td>
<td class="r" >
<input type="text" class="txt " name="address" value="{$data.address}" placeholder="请输入所在地址">
</td>
</tr>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>银行卡号：</td>
<td class="l">银行卡号：</td>
<td class="r" >
<input type="text" class="txt " name="bank_card" value="{$data.bank_card}" placeholder="请输入银行卡号">
</td>
@ -159,13 +159,13 @@
</td>
</tr> -->
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>收款银行：</td>
<td class="l">收款银行：</td>
<td class="r" >
<input type="text" class="txt " name="bank_name" value="{$data.bank_name}" placeholder="请输入收款银行">
</td>
</tr>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>开户网点：</td>
<td class="l">开户网点：</td>
<td class="r" >
<input type="text" class="txt " name="bank_address" value="{$data.bank_address}" placeholder="请输入开户网点">
</td>
@ -360,18 +360,18 @@
var obj = {
"company_name":["required","推广公司名称不允许为空"],
"platform_name":["nocheck"],
"contact_begin":["date","合同开始时间不能为空"],
"contact_end":["date","合同结束时间不能为空"],
// "contact_begin":["date","合同开始时间不能为空"],
// "contact_end":["date","合同结束时间不能为空"],
"fax_ratio":["number","开票税率必须是数字，如果无此项请填0"],
"company_type":["required","公司性质不能为空","select"],
"is_sign_contact":["required","是否签署合同项不能为空","select"],
"company_belong":["required","团体归属不能为空","select"],
"settlement_contact":["required","结算联系人不能为空"],
"contact_phone":["phone","联系人电话格式不对或不能为空"],
"address":["required","联系人地址不能为空"],
"bank_card":["bankid","银行卡格式错误或不能为空"],
"bank_name":["required","银行名称不能为空"],
"bank_address":["required","银行开户网点不能为空"],
// "address":["required","联系人地址不能为空"],
// "bank_card":["bankid","银行卡格式错误或不能为空"],
// "bank_name":["required","银行名称不能为空"],
// "bank_address":["required","银行开户网点不能为空"],
"content":["nocheck"],
"status":["nocheck","","radio"]
}

1
Application/Admin/View/TestOrder/addOrder.html
Unescape Escape View File

@ -147,6 +147,7 @@
<option value="15">双乾支付-快捷</option>
<option value="0">平台币</option>
<option value="-1">绑币</option>
<option value="17">易宝支付</option>
</select>
</td>
</tr>

1
Application/Admin/View/TestOrder/lists.html
Unescape Escape View File

@ -86,6 +86,7 @@
<option value="15" <if condition="$_GET['pay_way'] eq '15'">selected</if>>双乾支付-快捷</option>
<option value="0" <if condition="$_GET['pay_way'] eq '0'">selected</if>>平台币</option>
<option value="-1" <if condition="$_GET['pay_way'] eq '-1'">selected</if>>绑币</option>
<option value="-1" <if condition="$_GET['pay_way'] eq '17'">selected</if>>易宝支付</option>
</select>
</div>

Write Preview
Loading…
Cancel
Save