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

Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev

Browse Source
master
ELF 5 years ago
parent 9a2ec81bec 86f05872d2
commit 3895d5b015
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File

4
Application/Admin/Controller/PromoteController.class.php
Unescape Escape View File

@ -89,7 +89,7 @@ unset($_REQUEST['parent_id']);
reset($arr); reset($arr);
$sign = md5(http_build_query($arr) . 'wmkjtx_kj213'); $sign = md5(http_build_query($arr) . 'wmkjtx_kj213');
$arr['sign'] = $sign; $arr['sign'] = $sign;
$re_data = curl_post('http://oa.76ba.com/api/wanmeng/platformAccount',$arr); $re_data = curl_post('http://test.oa.76ba.com/api/wanmeng/platformAccount',$arr);
$re_data = json_decode($re_data,true); $re_data = json_decode($re_data,true);
if($re_data['code'] == 1) { if($re_data['code'] == 1) {
$oa = $re_data['data']; $oa = $re_data['data'];
@ -129,7 +129,7 @@ unset($_REQUEST['parent_id']);
reset($arr); reset($arr);
$sign = md5(http_build_query($arr) . 'wmkjtx_kj213'); $sign = md5(http_build_query($arr) . 'wmkjtx_kj213');
$arr['sign'] = $sign; $arr['sign'] = $sign;
$re_data = curl_post('http://oa.76ba.com/api/wanmeng/verifyBind',$arr); $re_data = curl_post('http://test.oa.76ba.com/api/wanmeng/verifyBind',$arr);
$re_data = json_decode($re_data,true)['data']; $re_data = json_decode($re_data,true)['data'];
foreach($list_data as $k => $v) foreach($list_data as $k => $v)
{ {

16
Application/Admin/Controller/SpendController.class.php
Unescape Escape View File

@ -93,13 +93,15 @@ class SpendController extends ThinkController
$order = ' pay_time desc '; $order = ' pay_time desc ';
} }
if (intval(($endTime + 1) - $startTime) / (24 * 3600) <= 31) { // if (intval(($endTime + 1) - $startTime) / (24 * 3600) <= 31) {
$map1 = $map; // $map1 = $map;
$map1['pay_status'] = 1; // $map1['pay_status'] = 1;
} else { // } else {
$map = '1 = 2'; // $map = '1 = 2';
$map1 = $map; // $map1 = $map;
} // }
$map1 = $map;
$map1['pay_status'] = 1;
$total = null_to_0(D(self::model_name)->where($map1)->sum('pay_amount')); $total = null_to_0(D(self::model_name)->where($map1)->sum('pay_amount'));
$ttotal = null_to_0(D(self::model_name)->where('pay_time' . total(1))->where(array('pay_status' => 1))->sum('pay_amount')); $ttotal = null_to_0(D(self::model_name)->where('pay_time' . total(1))->where(array('pay_status' => 1))->sum('pay_amount'));
$ytotal = null_to_0(D(self::model_name)->where('pay_time' . total(5))->where(array('pay_status' => 1))->sum('pay_amount')); $ytotal = null_to_0(D(self::model_name)->where('pay_time' . total(5))->where(array('pay_status' => 1))->sum('pay_amount'));

Write Preview
Loading…
Cancel
Save