过期或滑落的条件改了，最后付款日期这个条件，不再使用

application/admin/controller/user/User.php

@@ -230,8 +230,9 @@ class User extends Backend
 
         //开始列表
         $list = $this->model
-            ->where('last_paytime','lt',$hualuo_tendays_ago)
-            ->whereor('id','IN',$special_user)
+            /*->where('last_paytime','lt',$hualuo_tendays_ago)
+            ->whereor('id','IN',$special_user)*/
+            ->where('id','IN',$special_user)
             ->order($sort, $order)
             ->paginate($limit);
 
@@ -240,9 +241,15 @@ class User extends Backend
         foreach($user_list as $key => &$val){
             $user_id = $val['id'];
             $val['sum_order_price'] = isset($user_pay[$user_id]) ? $user_pay[$user_id] : 0;
+            $val['sum_fanyong'] = isset($user_fanyong[$user_id]) ? $user_fanyong[$user_id] : 0;
             $val['score'] = isset($user_score[$user_id]) ? $user_score[$user_id] : 0;
             $val['special'] = in_array($user_id,$special_user) ? '是' : '否';
             $val['tendaysago'] = date('Y-m-d H:i:s',$hualuo_tendays_ago);
+
+            //标点
+            $val['bd_1'] = '> (';
+            $val['bd_2'] = ' + ';
+            $val['bd_3'] = ' ) x 2';
         }
         //dump($user_list);
 

application/api/controller/Money.php

@@ -80,7 +80,7 @@ class Money extends Api
             }
             $bufen_bei = config('site.withdraw_bufen_bei');  //部分提现整数倍
             if($bufen_score < $bufen_bei){
-                $this->error('部分提现只能是'.$bufen_bei.'的整数倍,最小一倍,即:'.$bufen_bei);
+                $this->error('部分提现只能是'.$bufen_bei.'的整数倍,最小:'.$bufen_bei);
             }
             if($bufen_score % $bufen_bei > 0){
                 $this->error('部分提现只能是'.$bufen_bei.'的整数倍');

application/common/library/Auth.php

@@ -572,7 +572,7 @@ class Auth
     private function is_hualuo(){
         //上次购买日期已经过去11天了
         if($this->_user->last_paytime < hualuo_tendays_ago()){
-            return true;
+           // return true;
         }
 
         //收益总额超过了消费总额

public/assets/js/backend/user/user.js

@@ -154,7 +154,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 //                        {field: 'loginip', title: __('Loginip'), operate: 'LIKE'},
 //                        {field: 'loginfailure', title: __('Loginfailure')},
 //                        {field: 'joinip', title: __('Joinip'), operate: 'LIKE'},
-                        {field: 'jointime', title: __('Jointime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+//                        {field: 'jointime', title: __('Jointime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
 //                        {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
 //                        {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
 //                        {field: 'token', title: __('Token'), operate: 'LIKE'},
@@ -163,15 +163,19 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 //                        {field: 'mini_openid', title: __('Mini_openid'), operate: 'LIKE'},
 //                        {field: 'mini_sessionkey', title: __('Mini_sessionkey'), operate: 'LIKE'},
 //                        {field: 'unionid', title: __('Unionid'), operate: 'LIKE'},
-                        {field: 'introcode', title: __('Introcode'), operate: 'LIKE'},
-                        {field: 'last_paytime', title: __('Last_paytime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'tendaysago', title: '最后支付底线'},
+//                        {field: 'introcode', title: __('Introcode'), operate: 'LIKE'},
+//                        {field: 'last_paytime', title: __('Last_paytime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+//                        {field: 'tendaysago', title: '最后支付底线'},
 
 //                        {field: 'intro_num', title: __('Intro_num')},
 //                        {field: 'intro_num_all', title: __('Intro_num_all')},
-                        {field: 'intro_uid', title: __('Intro_uid')},
-                        {field: 'score', title: '用户积分'},
+//                        {field: 'intro_uid', title: __('Intro_uid')},
+                        {field: 'score', title: '用户总积分'},
+                        {field: 'bd_1', title: ''},
                         {field: 'sum_order_price', title: '总支付额'},
+                        {field: 'bd_2', title: ''},
+                        {field: 'sum_fanyong', title: '总推荐返佣'},
+                        {field: 'bd_3', title: ''},
                         {field: 'special', title: '是否超2倍'},
 //                        {field: 'intro_ids', title: __('Intro_ids')},
 //                        {field: 'intro_level', title: __('Intro_level')},