数字改为宏: 指定分销，人人分销

app/admin/controller/Test.php

@@ -9,6 +9,7 @@ use crmeb\utils\Redis;
 use think\facade\Log;
 use app\api\controller\board\UserBoardController;
 use app\models\redis\SystemCarousel;
+use app\models\user\WechatUser;
 use crmeb\services\async\LuckyExtACalc;
 use crmeb\services\async\LuckyExtBCalc;
 use crmeb\services\async\task\WechatNotify;
@@ -66,8 +67,27 @@ class Test
         echo 'result:' . $tfa->verifyCode($secret, $code);
     }
 
+    protected function test_routine_reg()
+    {
+        $routine['nickName'] = '山河另';
+        $routine['gender']=1;
+        $routine['language'] = 'zncn';
+        $routine['city']='zd';//
+        $routine['province']='hn';
+        $routine['country']='cn';//
+        $routine['avatarUrl']='http://x';
+        $routine['openId']='great';//
+        $routine['session_key']='bbc';
+        $routine['unionId']='';//用户在开放平台的唯一标识符
+        $routine['spid'] = 3;
+        $routine['code'] = '5';
+        $routine['session_key'] = 'bi';
+        $routine['login_type'] = 'routine';
+        echo WechatUser::routineOauth($routine);
+    }
+
     public function test()
     {
-        // $this->test_calc();
+        // return $this->test_routine_reg();
     }
 }

app/admin/model/user/User.php

@@ -451,7 +451,7 @@ class User extends BaseModel
         $user_count = self::setWherePage(self::getModelTime($where, new self), $where, ['is_promoter', 'status'])->count();
         $user_count_old = self::getOldDate($where)->count();
         $store_brokerage_statu = sys_config('store_brokerage_statu');
-        if ($store_brokerage_statu == 1)
+        if ($store_brokerage_statu == DISTRIBUTE_SPECIFIED)
             $fenxiao = self::setWherePage(self::getModelTime($where, new self), $where, ['is_promoter', 'status'])->where('spread_uid', '<>', 0)->count();
         else
             $fenxiao = self::count();
@@ -483,7 +483,7 @@ class User extends BaseModel
                 'count' => $fenxiao,
                 'content' => '分销总人数',
                 'background_color' => 'layui-bg-green',
-                'sum' => $store_brokerage_statu == 1 ? self::where('spread_uid', '<>', 0)->count() : $fenxiao,
+                'sum' => $store_brokerage_statu == DISTRIBUTE_SPECIFIED ? self::where('spread_uid', '<>', 0)->count() : $fenxiao,
                 'class' => 'fa fa-bar-chart',
             ],
             [
@@ -1196,7 +1196,7 @@ class User extends BaseModel
     {
         $userInfo = User::getUserInfo($orderInfo['uid']);
         if (!$userInfo || !$userInfo['spread_uid']) return true;
-        $storeBrokerageStatu = sys_config('store_brokerage_statu') ?: 1;//获取后台分销类型
+        $storeBrokerageStatu = sys_config('store_brokerage_statu') ?: DISTRIBUTE_SPECIFIED;//获取后台分销类型
         if ($storeBrokerageStatu == 1) {
             if (!User::be(['uid' => $userInfo['spread_uid'], 'is_promoter' => 1])) return true;
         }
@@ -1229,7 +1229,7 @@ class User extends BaseModel
         $userInfo = User::getUserInfo($orderInfo['uid']);
         $userInfoTwo = User::getUserInfo($userInfo['spread_uid']);
         if (!$userInfoTwo || !$userInfoTwo['spread_uid']) return true;
-        $storeBrokerageStatu = sys_config('store_brokerage_statu') ?: 1;//获取后台分销类型
+        $storeBrokerageStatu = sys_config('store_brokerage_statu') ?: DISTRIBUTE_SPECIFIED;//获取后台分销类型
         if ($storeBrokerageStatu == 1) {
             if (!User::be(['uid' => $userInfoTwo['spread_uid'], 'is_promoter' => 1])) return true;
         }

app/admin/model/wechat/WechatUser.php

@@ -162,7 +162,7 @@ class WechatUser extends BaseModel
             $alias .= '.';
         }
         $status = (int)sys_config('store_brokerage_statu');
-        if ($status == 1) {
+        if ($status == DISTRIBUTE_SPECIFIED) {
             if ($Listuids = User::where(['is_promoter' => 1])->field('uid')->select()) {
                 $newUids = [];
                 foreach ($Listuids as $item) {

app/api/controller/PublicController.php

@@ -113,7 +113,7 @@ class PublicController
         $vipOpen = is_string($vipOpen) ? (int)$vipOpen : $vipOpen;
         foreach ($menusInfo as $key => &$value) {
             $value['pic'] = set_file_url($value['pic']);
-            if ($value['id'] == 137 && !(intval(sys_config('store_brokerage_statu')) == 2 || $user->is_promoter == 1))
+            if ($value['id'] == 137 && !(intval(sys_config('store_brokerage_statu')) == DISTRIBUTE_EVERYONE || $user->is_promoter == 1))
                 unset($menusInfo[$key]);
             if ($value['id'] == 174 && !StoreService::orderServiceStatus($user->uid))
                 unset($menusInfo[$key]);

app/api/controller/activity/StoreBargainController.php

@@ -327,7 +327,7 @@ class StoreBargainController
                 $imageInfo = SystemAttachment::getInfo($name, 'name');
                 if (!$imageInfo) {
                     $valueData = 'id=' . $bargainId . '&bargain=' . $user['uid'];
-                    if ($user['is_promoter'] || sys_config('store_brokerage_statu') == 2) $valueData .= '&pid=' . $user['uid'];
+                    if ($user['is_promoter'] || sys_config('store_brokerage_statu') == DISTRIBUTE_EVERYONE) $valueData .= '&pid=' . $user['uid'];
                     $res = RoutineCode::getPageCode('pages/activity/goods_bargain_details/index', $valueData, 280);
                     if (!$res) return app('json')->fail('二维码生成失败');
                     $uploadType = (int)sys_config('upload_type', 1);

app/api/controller/activity/StoreCombinationController.php

@@ -218,7 +218,7 @@ class StoreCombinationController
                 $imageInfo = SystemAttachment::getInfo($name, 'name');
                 if (!$imageInfo) {
                     $valueData = 'id=' . $pinkId;
-                    if ($user['is_promoter'] || sys_config('store_brokerage_statu') == 2) $valueData .= '&pid=' . $user['uid'];
+                    if ($user['is_promoter'] || sys_config('store_brokerage_statu') == DISTRIBUTE_EVERYONE) $valueData .= '&pid=' . $user['uid'];
                     $res = RoutineCode::getPageCode('pages/activity/goods_combination_status/index', $valueData, 280);
                     if (!$res) return app('json')->fail('二维码生成失败');
                     $uploadType = (int)sys_config('upload_type', 1);

app/api/controller/store/StoreProductController.php

@@ -76,7 +76,7 @@ class StoreProductController
                     $siteUrl = sys_config('site_url');
                     if (!$imageInfo) {
                         $data = 'id=' . $id;
-                        if ($user['is_promoter'] || sys_config('store_brokerage_statu') == 2) $data .= '&pid=' . $user['uid'];
+                        if ($user['is_promoter'] || sys_config('store_brokerage_statu') == DISTRIBUTE_EVERYONE) $data .= '&pid=' . $user['uid'];
                         $res = \app\models\routine\RoutineCode::getPageCode('pages/goods_details/index', $data, 280);
                         if (!$res) return app('json')->fail('二维码生成失败');
                         $uploadType = (int)sys_config('upload_type', 1);

app/api/controller/user/UserController.php

@@ -103,7 +103,7 @@ class UserController
         $user['statu'] = (int)sys_config('store_brokerage_statu');
         $broken_time = intval(sys_config('extract_time'));
         $search_time = time() - 86400 * $broken_time;
-        if (!$user['is_promoter'] && $user['statu'] == 2) {     // 人人分销
+        if (!$user['is_promoter'] && $user['statu'] == DISTRIBUTE_EVERYONE) {     // 人人分销
             $price = StoreOrder::where(['paid' => 1, 'refund_status' => 0, 'uid' => $user['uid']])->sum('pay_price');
             $status = is_brokerage_statu($price);
             if ($status) {
@@ -501,7 +501,7 @@ class UserController
         }
         unset($user['pwd']);
         if (!$user['is_promoter']) {
-            $user['is_promoter'] = (int)sys_config('store_brokerage_statu') == 2 ? true : false;
+            $user['is_promoter'] = (int)sys_config('store_brokerage_statu') == DISTRIBUTE_EVERYONE ? true : false;
         }
         return app('json')->successful($user->hidden(['account', 'real_name', 'birthday', 'card_id', 'mark', 'partner_id', 'group_id', 'add_time', 'add_ip', 'phone', 'last_time', 'last_ip', 'spread_uid', 'spread_time', 'user_type', 'status', 'level', 'clean_time', 'addres'])->toArray());
     }

app/models/user/User.php

@@ -174,8 +174,8 @@ class User extends BaseModel
         if ($uid == self::where('uid', $spread)->value('spread_uid')) return true;
         //TODO 获取后台分销类型
         $storeBrokerageStatus = sys_config('store_brokerage_statu');
-        $storeBrokerageStatus = $storeBrokerageStatus ? $storeBrokerageStatus : 1;
-        if ($storeBrokerageStatus == 1) {
+        $storeBrokerageStatus = $storeBrokerageStatus ? $storeBrokerageStatus : DISTRIBUTE_SPECIFIED;
+        if ($storeBrokerageStatus == DISTRIBUTE_SPECIFIED) {
             $spreadCount = self::where('uid', $spread)->count();
             if ($spreadCount) {
                 $spreadInfo = self::where('uid', $spread)->find();
@@ -267,7 +267,7 @@ class User extends BaseModel
         if (!$uid) return false;
         $status = (int)sys_config('store_brokerage_statu');
         $isPromoter = true;
-        if ($status == 1) $isPromoter = self::where('uid', $uid)->value('is_promoter');
+        if ($status == DISTRIBUTE_SPECIFIED) $isPromoter = self::where('uid', $uid)->value('is_promoter');
         if ($isPromoter) return true;
         else return false;
     }
@@ -492,8 +492,8 @@ class User extends BaseModel
         if ($uid == $spreadUid) return false;
         //TODO 获取后台分销类型
         $storeBrokerageStatus = sys_config('store_brokerage_statu');
-        $storeBrokerageStatus = $storeBrokerageStatus ? $storeBrokerageStatus : 1;
-        if ($storeBrokerageStatus == 1) {
+        $storeBrokerageStatus = $storeBrokerageStatus ? $storeBrokerageStatus : DISTRIBUTE_SPECIFIED;
+        if ($storeBrokerageStatus == DISTRIBUTE_SPECIFIED) {
             $spreadCount = self::where('uid', $spreadUid)->count();
             if ($spreadCount) {
                 $spreadInfo = self::where('uid', $spreadUid)->find();