tijiao

app/models/user/User.php

@@ -65,6 +65,7 @@ class User extends BaseModel
      */
     public static function setWechatUser($wechatUser, $spread_uid = 0)
     {
+        $storeBrokerageStatu = sys_config('store_brokerage_statu') ?: 1;//获取后台分销类型
         $res = self::create([
             'account' => 'wx' . $wechatUser['uid'] . time(),
             'pwd' => md5(123456),
@@ -75,6 +76,7 @@ class User extends BaseModel
             'last_time' => time(),
             'last_ip' => app('request')->ip(),
             'uid' => $wechatUser['uid'],
+            'is_promoter' => $storeBrokerageStatu != 1 ? 1 : 0,
             'user_type' => 'wechat'
         ]);
         return $res && UserSpread::setSpread($wechatUser['uid'], $spread_uid);
@@ -208,14 +210,14 @@ class User extends BaseModel
         self::beginTrans();
         $res1 = true;
         if ($spread_uid) $res1 = self::where('uid', $spread_uid)->inc('spread_count', 1)->update();
-//        $storeBrokerageStatu = sys_config('store_brokerage_statu') ? : 1;//获取后台分销类型
+        $storeBrokerageStatu = sys_config('store_brokerage_statu') ?: 1;//获取后台分销类型
         $res2 = self::create([
             'account' => 'rt' . $routineUser['uid'] . time(),
             'pwd' => md5(123456),
             'nickname' => $routineUser['nickname'] ?: '',
             'avatar' => $routineUser['headimgurl'] ?: '',
 //            'spread_uid' => $spread_uid,
-//            'is_promoter'=>$spread_uid || $storeBrokerageStatu != 1 ? 1: 0,
+            'is_promoter' => $storeBrokerageStatu != 1 ? 1 : 0,
 //            'spread_time' => $spread_uid ? time() : 0,
             'uid' => $routineUser['uid'],
             'add_time' => $routineUser['add_time'],
@@ -589,6 +591,7 @@ class User extends BaseModel
      */
     public static function register($account, $password, $spread)
     {
+        $storeBrokerageStatu = sys_config('store_brokerage_statu') ?: 1;//获取后台分销类型
         if (self::be(['account' => $account])) return self::setErrorInfo('用户已存在');
         $phone = $account;
         $data['account'] = $account;
@@ -614,6 +617,7 @@ class User extends BaseModel
         $data['language'] = '';
         $data['province'] = '';
         $data['country'] = '';
+        $data['is_promoter'] = $storeBrokerageStatu != 1 ? 1 : 0;
         self::beginTrans();
         $res2 = WechatUser::create($data);
         $data['uid'] = $res2->uid;

app/models/user/UserBill.php

@@ -152,20 +152,17 @@ class UserBill extends BaseModel
         $model = self::where('uid', $uid)->where('category', 'now_money')->order('add_time desc')->where('number', '<>', 0)
             ->field('FROM_UNIXTIME(add_time,"%Y-%m") as time,group_concat(id SEPARATOR ",") ids')->group('time');
         switch ((int)$type) {
-            case 0:
-                $model = $model->where('type', 'in', 'recharge,brokerage,pay_product,system_add,pay_product_refund,system_sub');
-                break;
             case 1:
-                $model = $model->where('type', 'pay_product');
+                $model = $model->where('type', '<>', 'brokerage')->where('pm', 0);
                 break;
             case 2:
-                $model = $model->where('type', 'in', 'recharge,system_add');
+                $model = $model->where('type', '<>', 'brokerage')->where('pm', 1);
                 break;
             case 3:
-                $model = $model->where('type', 'brokerage')->whereOr('type', 'recharge');
+                $model = $model->where('type', 'brokerage')->where('pm', 1);
                 break;
             case 4:
-                $model = $model->where('type', 'extract')->whereOr('type', 'recharge');
+                $model = $model->where('type', 'brokerage')->where('pm', 0);
                 break;
         }
         if ($page) $model = $model->page((int)$page, (int)$limit);