From a900e5ed66a810360a9f993ff58473dc3d4fa148 Mon Sep 17 00:00:00 2001 From: zhanglingsheng Date: Wed, 27 Nov 2019 14:43:25 +0800 Subject: [PATCH 1/4] =?UTF-8?q?OA=E5=85=B3=E8=81=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/PromoteController.class.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/PromoteController.class.php b/Application/Admin/Controller/PromoteController.class.php index f7424d0c0..71aa91667 100644 --- a/Application/Admin/Controller/PromoteController.class.php +++ b/Application/Admin/Controller/PromoteController.class.php @@ -89,8 +89,9 @@ unset($_REQUEST['parent_id']); reset($arr); $sign = md5(http_build_query($arr) . 'wmkjtx_kj213'); $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); + var_dump($re_data);exit; if($re_data['code'] == 1) { $oa = $re_data['data']; $oa_data = array_merge($oa_data,$oa); @@ -129,7 +130,7 @@ unset($_REQUEST['parent_id']); reset($arr); $sign = md5(http_build_query($arr) . 'wmkjtx_kj213'); $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']; foreach($list_data as $k => $v) { From 4e56f9e325d57c2702f59360389ef62ef33f5ea4 Mon Sep 17 00:00:00 2001 From: yulingwei <2436953959@qq.com> Date: Wed, 27 Nov 2019 14:46:49 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/SpendController.class.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Application/Admin/Controller/SpendController.class.php b/Application/Admin/Controller/SpendController.class.php index 945cc790f..f7de26932 100644 --- a/Application/Admin/Controller/SpendController.class.php +++ b/Application/Admin/Controller/SpendController.class.php @@ -93,13 +93,15 @@ class SpendController extends ThinkController $order = ' pay_time desc '; } - if (intval(($endTime + 1) - $startTime) / (24 * 3600) <= 31) { - $map1 = $map; - $map1['pay_status'] = 1; - } else { - $map = '1 = 2'; - $map1 = $map; - } + // if (intval(($endTime + 1) - $startTime) / (24 * 3600) <= 31) { + // $map1 = $map; + // $map1['pay_status'] = 1; + // } else { + // $map = '1 = 2'; + // $map1 = $map; + // } + $map1 = $map; + $map1['pay_status'] = 1; $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')); $ytotal = null_to_0(D(self::model_name)->where('pay_time' . total(5))->where(array('pay_status' => 1))->sum('pay_amount')); From 265cf9f6448e35080d920fa61ebdcd2e350a44b1 Mon Sep 17 00:00:00 2001 From: zhanglingsheng Date: Wed, 27 Nov 2019 14:47:40 +0800 Subject: [PATCH 3/4] OA --- Application/Admin/Controller/PromoteController.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/PromoteController.class.php b/Application/Admin/Controller/PromoteController.class.php index f7424d0c0..3d1c0f29c 100644 --- a/Application/Admin/Controller/PromoteController.class.php +++ b/Application/Admin/Controller/PromoteController.class.php @@ -89,7 +89,7 @@ unset($_REQUEST['parent_id']); reset($arr); $sign = md5(http_build_query($arr) . 'wmkjtx_kj213'); $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); if($re_data['code'] == 1) { $oa = $re_data['data']; @@ -129,7 +129,7 @@ unset($_REQUEST['parent_id']); reset($arr); $sign = md5(http_build_query($arr) . 'wmkjtx_kj213'); $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']; foreach($list_data as $k => $v) { From 86f05872d2bebdeede7eb7a8b0b94f710a797151 Mon Sep 17 00:00:00 2001 From: zhanglingsheng Date: Wed, 27 Nov 2019 14:48:21 +0800 Subject: [PATCH 4/4] OA --- Application/Admin/Controller/PromoteController.class.php | 1 - 1 file changed, 1 deletion(-) diff --git a/Application/Admin/Controller/PromoteController.class.php b/Application/Admin/Controller/PromoteController.class.php index 71aa91667..3d1c0f29c 100644 --- a/Application/Admin/Controller/PromoteController.class.php +++ b/Application/Admin/Controller/PromoteController.class.php @@ -91,7 +91,6 @@ unset($_REQUEST['parent_id']); $arr['sign'] = $sign; $re_data = curl_post('http://test.oa.76ba.com/api/wanmeng/platformAccount',$arr); $re_data = json_decode($re_data,true); - var_dump($re_data);exit; if($re_data['code'] == 1) { $oa = $re_data['data']; $oa_data = array_merge($oa_data,$oa);