Wesmiler 2021-0115第4期分销功能新增

app/api/controller/MemberController.php

@@ -33,7 +33,11 @@ class MemberController extends BaseController
             if($userStatus == -1) {
                 showJson(1006, 1016, ['url' => 'https://mp.weixin.qq.com/mp/profile_ext?action=home&__biz=Mzg3ODEzNjMzMQ==&scene=124#wechat_redirect']);
             }
-            showJson(1006, $freezingChoose>0? 1020+$freezingChoose : 1011, ['url' => url('/weixin/page/custom', '', '', true)]);
+            $uncheck = input('uncheck', 0);
+            $action = request()->action();
+            if(!in_array($action,['getRecommendList']) && (($action == 'getInfo' || $action == 'getHomeInfo') && !$uncheck)){
+                showJson(1006, $freezingChoose>0? 1020+$freezingChoose : 1011, ['url' => url('/weixin/page/custom', '', '', true)]);
+            }
         }
     }
 
@@ -53,7 +57,7 @@ class MemberController extends BaseController
         }
         // 冻结
         $userStatus = isset($memberInfo['user_status']) ? intval($memberInfo['user_status']) : 0;
-        if ($userStatus != 1 && $type != 1) {
+        if ((!in_array($type,[1,8])) && $userStatus != 1 && $type != 1) {
             showJson(1006, 2102, ['url' => url('/weixin/page/custom', '', '', true)]);
         }
 
@@ -705,7 +709,7 @@ class MemberController extends BaseController
                 }
             }
         }
-        PRedis::set('test:' . $userId, ['homeInfo' => $myInfo, 'cUserInfo' => $cUserInfo, 'cInfo' => $cInfo], 600);
+        //PRedis::set('test:' . $userId, ['homeInfo' => $myInfo, 'cUserInfo' => $cUserInfo, 'cInfo' => $cInfo], 600);
         showJson(1005, 1008, ['homeInfo' => $myInfo, 'cUserInfo' => $cUserInfo, 'cInfo' => $cInfo]);
 
     }

app/weixin/controller/MemberController.php

@@ -23,7 +23,8 @@ class MemberController extends BaseController
         $userStatus = isset($userInfo['user_status']) ? intval($userInfo['user_status']) : 0;
         $agentType = isset($userInfo['agent_type']) ? intval($userInfo['agent_type']) : 0;
         $agentStatus = isset($userInfo['agent_status']) ? intval($userInfo['agent_status']) : 0;
-        if($agentType == 1 && $agentStatus != 3 && $needRegProfile != 1){
+        $action = request()->action();
+        if($agentType == 1 && $agentStatus != 3 && ($needRegProfile != 1 || ($action != 'home' && $userStatus != 1))){
             $url = url('/weixin/market/index', '', '', true);
             header("location:{$url}");
             exit;

app/weixin/service/Award.php

@@ -102,7 +102,7 @@ class Award
         // 验证上级用户是否符合奖励条件
 
         $where = ['id' => $userId, 'agent_type' => 1, 'agent_status' => 1];
-        $field = 'id,openid,user_nickname,parent_id,user_login,balance';
+        $field = 'id,openid,user_nickname,parent_id,user_login,balance,create_time';
         $userInfo = Member::getInfo($where, $field);
         $nickname = isset($userInfo['nickname']) ? trim($userInfo['nickname']) : '';
         $userLogin = isset($userInfo['user_login']) ? trim($userInfo['user_login']) : '';
@@ -114,6 +114,13 @@ class Award
             return false;
         }
 
+        // 旧用户不结算
+        $createTime = isset($userInfo['create_time'])? $userInfo['create_time'] : 0;
+        if ($createTime && $createTime <= strtotime('2021-02-23')) {
+            PRedis::set("{$cacheKey}:error_user_reg_time", $logData, 7200);
+            return false;
+        }
+
         // 收益原始来源用户
         $sWhere = ['id' => $sourceUid, 'user_type' => 2];
         $sourceInfo = Member::getInfo($sWhere, $field);