Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_promote_company

master
sk 5 years ago
commit c612fbc5fd

@ -7203,7 +7203,7 @@ class ExportController extends Controller
if (!empty(I('timestart'))) { if (!empty(I('timestart'))) {
$timestart = strtotime(I('timestart')); $timestart = strtotime(I('timestart'));
$map['_string'] = "pay_time > {$timestart}"; $map['_string'] = "pay_time >= {$timestart}";
} }
if (!empty(I('timeend'))) { if (!empty(I('timeend'))) {

@ -778,7 +778,7 @@ class FinanceController extends ThinkController
if (!empty(I('timestart'))) { if (!empty(I('timestart'))) {
$timestart = strtotime(I('timestart')); $timestart = strtotime(I('timestart'));
$map['_string'] = "pay_time > {$timestart}"; $map['_string'] = "pay_time >= {$timestart}";
} }
if (!empty(I('timeend'))) { if (!empty(I('timeend'))) {

@ -111,6 +111,7 @@ class PromoteController extends ThinkController
$map['oa_associated'] = I('oa_associated'); $map['oa_associated'] = I('oa_associated');
$oa_data = []; $oa_data = [];
for ($i = 1; $i > 0; $i++) { for ($i = 1; $i > 0; $i++) {
$arr = [];
$arr['time'] = time(); $arr['time'] = time();
$arr['page'] = $i; $arr['page'] = $i;
$arr['pageSize'] = 1000; $arr['pageSize'] = 1000;
@ -120,7 +121,7 @@ class PromoteController extends ThinkController
$arr['sign'] = $sign; $arr['sign'] = $sign;
$re_data = curl_post(C('OA.formalUrl') . '/api/wanmeng/platformAccount', $arr); $re_data = curl_post(C('OA.formalUrl') . '/api/wanmeng/platformAccount', $arr);
$re_data = json_decode($re_data, true); $re_data = json_decode($re_data, true);
if ($re_data['code'] == 1) { if (!empty($re_data['data'])) {
$oa = $re_data['data']; $oa = $re_data['data'];
$oa_data = array_merge($oa_data, $oa); $oa_data = array_merge($oa_data, $oa);
} else { } else {

Loading…
Cancel
Save