wesmiler 更新第5期更新代码合并

app/weixin/controller/ActivityController.php

@@ -27,6 +27,10 @@ class ActivityController extends BaseController
      * @return mixed
      */
     public function book(){
+        $sid = input('sid', 0);
+        if($sid){
+            session('sid', input('sid', 0));
+        }
         return $this->fetch();
     }
 

app/weixin/controller/MatchController.php

@@ -11,6 +11,10 @@ class MatchController extends BaseController
      * @return mixed
      */
     public function index(){
+        $sid = input('sid', 0);
+        if($sid){
+            session('sid', input('sid', 0));
+        }
         return $this->fetch();
     }
 
@@ -19,6 +23,10 @@ class MatchController extends BaseController
      * @return mixed
      */
     public function hearts(){
+        $sid = input('sid', 0);
+        if($sid){
+            session('sid', input('sid', 0));
+        }
         return $this->fetch();
     }
 

app/weixin/controller/MemberController.php

@@ -71,6 +71,10 @@ class MemberController extends BaseController
      */
     public function home()
     {
+        $sid = input('sid', 0);
+        if($sid){
+            session('sid', input('sid', 0));
+        }
         return $this->fetch();
     }
 

app/weixin/model/Member.php

@@ -213,6 +213,11 @@ class Member extends Model
                 $info['birthday_txt'] = $birthday ? date('Y年m月d日', $birthday) : '';
                 $info['birthday_code'] = $birthday ? date('Y-m-d', $birthday) : '';
                 $info['birthday_day'] = $birthday ? date('y年', $birthday) : '';
+                $year = $birthday? date('Y', $birthday) : 0;
+                if($year){
+                    $info['age'] = date('Y')-$year;
+                    $info['year'] = $year;
+                }
             }
 
             $info['height_txt'] = '';

app/weixin/model/Wechat.php

@@ -243,6 +243,8 @@ class Wechat
 
 
         // 用户信息
+        $inviteId = input('sid', 0);
+        $inviteId = $inviteId? $inviteId : session('sid');
         $userData = [
             'sex' => $wxData['sex'],
             'openid' => $wxData['openid'],
@@ -272,6 +274,7 @@ class Wechat
                     ->update($userData);
             } else {
                 $userData['wxInfo'] = $wxInfo;
+                $userData['parent_id'] = $inviteId;
                 $result = Member::regMember($userData);
                 $userId = isset($result['userId']) ? $result['userId'] : 0;
                 if (!$userId) {
@@ -302,6 +305,7 @@ class Wechat
 
                 // 注册用户
                 $userData['wxInfo'] = $wxInfo;
+                $userData['parent_id'] = $inviteId;
                 $result = Member::regMember($userData);
                 $userId = isset($result['userId']) ? $result['userId'] : 0;
                 if (!$userId) {
@@ -333,6 +337,7 @@ class Wechat
 
         // 记录OPENID
         $userInfo = Member::getInfo(['openid' => $openid]);
+        //PRedis::set('test:'.$openid, ['sid'=> input('sid', 0),'ssid'=> session('sid')], 600);
         PRedis::set($cacheKey, $userInfo, 7 * 24 * 3600);
         session('userInfo', $userInfo);
         session('openid', $openid);

app/weixin/service/Award.php

@@ -120,6 +120,7 @@ class Award
         $nickname = $nickname? $nickname : formatName($userLogin);
         $logData['userInfo'] = $userInfo;
         if (empty($userInfo)) {
+            $logData['error'] = '审核用户信息不存在';
             PRedis::set("{$cacheKey}:error_user", $logData, 7200);
             return false;
         }
@@ -134,6 +135,7 @@ class Award
         // 旧用户不结算
         $createTime = isset($sourceInfo['create_time'])? $sourceInfo['create_time'] : 0;
         if ($createTime && $createTime <= strtotime('2021-02-23')) {
+            $logData['error'] = '注册时间不在结算范围内';
             PRedis::set("{$cacheKey}:error_user_reg_time", $logData, 7200);
             return false;
         }

app/weixin/service/Member.php

@@ -168,8 +168,8 @@ class Member
             // 认证分销收益结算
             $inviteInfo = MemberModel::getInviteInfo($userId);
             $inviteId = isset($inviteInfo['invite_id'])? $inviteInfo['invite_id'] : 0;
-            if($inviteInfo && $inviteId>0){
-                PRedis::set('markets:auth:entry' . $scene, ['inviteInfo'=> $inviteInfo, 'memberInfo' => $memberInfo], 7200);
+            if($inviteInfo && $inviteId>0 && $status == 2){
+                PRedis::set('markets:auth:entry:' . $scene.'_'.$userId, ['inviteInfo'=> $inviteInfo, 'memberInfo' => $memberInfo], 7200);
 
                 $types = ['idcard'=> 5, 'education'=> 6, 'position'=> 7];
                 $type = isset($types[$scene])? $types[$scene] : 0;