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) { 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'));