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

Application/Admin/Controller/PromoteController.class.php

@@ -91,6 +91,7 @@ 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);

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