From 6bbd51ce41a6bb79349d36156912d6fa875b77fd Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期一, 19 六月 2023 11:00:11 +0800
Subject: [PATCH] Merge branch 'hotfix/618修复' into feature/1.1.3api开发

---
 application/api/controller/User.php |   63 +++++++++++++++++++++++++++++--
 1 files changed, 59 insertions(+), 4 deletions(-)

diff --git a/application/api/controller/User.php b/application/api/controller/User.php
index f2999c6..565fb1c 100644
--- a/application/api/controller/User.php
+++ b/application/api/controller/User.php
@@ -18,6 +18,8 @@
 use app\api\logic\UserWithdrawal as LogicUserWithdrawal;
 use app\api\logic\SettlementRecord as LogicSettlementRecord;
 use app\api\logic\UserMoneyLog as LogicUserMoneyLog;
+use think\log;
+
 /**
  * 浼氬憳鎺ュ彛
  */
@@ -84,6 +86,7 @@
         $mobile = $this->request->post('mobile');
         $captcha = $this->request->post('captcha');
         $ismobouth=$this->request->post('ismobouth',false);
+        $push_cid=$this->request->post('push_cid',false);
         if (!$mobile || !$captcha) {
             $this->error(__('Invalid parameters'));
         }
@@ -245,6 +248,7 @@
     {
         $openid = request()->param('openid');
         $access_token = request()->param('access_token');
+        $push_cid=request()->param('push_cid','');
         $LogicUser = new LogicUser();
         $userId = $LogicUser->getUserByOpenId($openid);
         if ($userId) {
@@ -252,6 +256,10 @@
             if(empty($user)) $this->error("鐢ㄦ埛淇℃伅鑾峰彇澶辫触");
             if ($user['status'] != 'normal') {
                 $this->error(__('Account is locked'));
+            }
+            if(!empty($push_cid)&&empty($user['push_cid']))
+            {//琛ㄩ噷push_cid涓虹┖锛岃ˉ鍏╬ush_cid
+                
             }
             //濡傛灉宸茬粡鏈夎处鍙峰垯鐩存帴鐧诲綍
             $ret = $this->auth->direct($user['id']);
@@ -282,16 +290,21 @@
         if(empty($wxUser)) $this->error('寰俊鎺堟潈淇℃伅鑾峰彇澶辫触');
         $mobile = $this->request->post('mobile');
         $captcha = $this->request->post('captcha');
-        if (!$mobile || !$captcha) {
+        $isyj=$this->request->post('isyj',false);
+        if (!$mobile || (!$isyj&&!$captcha)) {
             $this->error(__('Invalid parameters'));
         }
         if (!Validate::regex($mobile, "^1\d{10}$")) {
             $this->error('璇疯緭鍏ユ纭墜鏈哄彿');
         }
-        $result = Sms::check($mobile, $captcha, 'changemobile');
-        if (!$result) {
-            $this->error(__('Captcha is incorrect'));
+        if(!$isyj)
+        {
+            $result = Sms::check($mobile, $captcha, 'changemobile');
+            if (!$result) {
+                $this->error(__('Captcha is incorrect'));
+            }
         }
+        
         $ModelThird = new ModelThird();
         $LogicUser = new LogicUser();
         //鍒ゆ柇褰撳墠鎵嬫満鍙锋槸鍚﹀凡缁忕粦瀹氬井淇�
@@ -428,6 +441,46 @@
         if($res === false) $this->error($LogicUserBrowse->getError());
 
         $this->success([],'鍒犻櫎鎴愬姛');
+    }
+
+
+    /**
+     * 鏍囪娴忚0鍏冭喘鍟嗗搧璁板綍
+     *
+     * @return void
+     */
+    public function update_first_free_browse()
+    {
+        $ids = request()->param('goodsid','');
+
+        $new_goodsId = request()->param('new_goodsId','');
+
+        $LogicUserBrowse = new LogicUserBrowse();
+
+        $res = $LogicUserBrowse->updatefirstfreelog(USERID,$ids,$new_goodsId);
+
+        if($res === false) $this->error($LogicUserBrowse->getError());
+
+        $this->success([],'娣诲姞鎴愬姛');
+    }
+
+    /**
+     * 妫�娴嬫槸鍚﹂鍗�
+     *
+     * @return void
+     */
+
+    public function check_isfirst_free()
+    {
+
+        $LogicUserBrowse = new LogicUserBrowse();
+
+        $res = $LogicUserBrowse->checkIsFirstFree(USERID);
+
+        if($res === false) $this->error($LogicUserBrowse->getError());
+        Log::write('妫�娴嬫槸鍚﹂鍗曪細'.json_encode($res));
+        if(empty($res)) $this->success(['info'=>1],'棣栧崟瀹㈡埛');
+        $this->success(['info'=>0],'闈為鍗曞鎴�');
     }
 
 
@@ -743,6 +796,7 @@
         $user_jjcj_num = $ModelUser->where(['f_invitation_id'=>USERID,'level'=>1])->count(); //闂存帴鍒濈骇浜烘暟
         $user_zszj_num = $ModelUser->where(['invitation_id'=>USERID,'level'=>2])->count(); //鐩村睘涓骇浜烘暟
         $user_jjzj_num = $ModelUser->where(['f_invitation_id'=>USERID,'level'=>2])->count(); //闂存帴涓骇浜烘暟
+        $user_zong_num = $ModelUser->where(['invitation_id'=>USERID])->count(); //鎬婚個璇蜂汉鏁�
         $user_monthly_commission = LogicUser::getUserCommission($user['id'],'month'); //鑾峰彇杩�30浣ｉ噾
         $user_total_commission = LogicUser::getUserCommission($user['id'],'total'); //鑾峰彇绱浣ｉ噾
         $data = [
@@ -751,6 +805,7 @@
                 'user_jjcj_num' => $user_jjcj_num,
                 'user_zszj_num' => $user_zszj_num,
                 'user_jjzj_num' => $user_jjzj_num,
+                'user_zong_num'=>$user_zong_num,
                 'user_monthly_commission' => $user_monthly_commission,
                 'total_commission' => $user_total_commission
             ],

--
Gitblit v1.9.3