Merge branch 'master' into dev-sxb

app/common/middleware/RateLimitMiddleware.php

@@ -9,8 +9,8 @@ class RateLimitMiddleware
 {
     // 频率限制配置（单位：秒）
     protected $rules = [
-        'ip' => ['limit' => 10, 'window' => 60],    // 每IP每分钟10次
-        'mobile' => ['limit' => 5, 'window' => 3600] // 每手机号每小时5次
+        'ip' => ['limit' => 20, 'window' => 60],    // 每IP每分钟10次
+        'mobile' => ['limit' => 20, 'window' => 3600] // 每手机号每小时5次
     ];
 
     public function handle($request, \Closure $next)

app/common/repositories/finance/FinanceRepository.php

@@ -1868,6 +1868,8 @@ class FinanceRepository extends BaseRepository
         $query5 = clone $query;
         $query6 = clone $query;
         $query7 = clone $query;
+        $query8 = clone $query;
+        $query9 = clone $query;
 
         //导出数据
         $is_excel = request()->param('is_excel', 0);
@@ -1915,6 +1917,14 @@ class FinanceRepository extends BaseRepository
         $date['statistics']['all'] = decimal2($query1->sum('number'));
         // $date['statistics']['clear'] = decimal2($query2->where('uss.type', 1)->sum('number'));
         $date['statistics']['nclear'] = decimal2($query3->where('uss.type', 2)->sum('number'));
+
+        //按照备注内容分类统计vr
+        $date['statistics']['transfervr'] = decimal2($query4->whereLike('uss.mark', '%消耗VR%')->sum('number'));
+        $date['statistics']['acquirevr'] = decimal2($query5->whereLike('uss.mark', '%到账VR%')->sum('number'));
+        $date['statistics']['transitionvr'] = decimal2($query6->whereLike('uss.mark', '%佣金转VR%')->sum('number'));
+        $date['statistics']['jcshqvr'] = decimal2($query7->whereLike('uss.mark', '%购买精彩%')->sum('number'));
+        $date['statistics']['hyzqvr'] = decimal2($query8->whereLike('uss.mark', '%购买会员%')->sum('number'));
+        $date['statistics']['allbuyvr'] = decimal2($query9->whereLike('uss.mark', '%购买%')->sum('number'));
  
         return $date;
     }

app/common/repositories/store/order/StoreOrderRepository.php

@@ -6866,6 +6866,9 @@ class StoreOrderRepository extends BaseRepository
                             $u['douhuomall_status'] = 2;
                             $u['douhuomall_order_no'] = $res['result']['out_order_no'] ?? '';
                         }
+                        if ($u['douhuomall_msg'] == 'Token不存在或已失效') {
+                            $u['douhuomall_status'] = 9;
+                        }
                         Db::name('store_order')->where('order_sn', $value['order_sn'])->update($u);
                         $u['order_id'] = $value['order_id'];
                         $u['product_id'] = $v['product_id'];

app/common/repositories/user/UserRepository.php

@@ -3247,53 +3247,121 @@ class UserRepository extends BaseRepository
 
     }
 
-    /*微信登录验证
-     $openid 微信openid
-    */
-    public  function  wechatCheck($openid, $nickname = null, $headimgurl = null){
-        $user = Db::name("user")->where(['wechat_user_id'=>$openid])->find();
-        //判断是否是第一次登录
-        if($user){
-            //成功登录业务逻辑
-            if (!$user['account']) {
+    /**
+     * 微信登录验证
+     * @param $openid
+     * @param $nickname
+     * @param $headimgurl
+     * @return array
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
+     */
+    public function wechatCheck($openid, $nickname = null, $headimgurl = null): array
+    {
+        // 1、判断 该openID 是否绑定多个用户
+        $userDataList = Db::name("user")->where(['wechat_user_id' => $openid])->select()->toArray();
+        $normalUserDataList = [];
+        $normalUserData = [];
+        if (!empty($userDataList)) {
+            $resetWechatUserIdList = [];
+            foreach ($userDataList as $userdata) {
+                if ($userdata['is_del'] == 1) {
+                    $resetWechatUserIdList[] = $userdata['uid'];
+                } else {
+                    $normalUserDataList[] = $userdata;
+                }
+            }
+            if (!empty($resetWechatUserIdList)) {
+                Db::name("user")->whereIn('uid', $resetWechatUserIdList)->update(["wechat_user_id" => 0]);
+                Db::name("user_extract_openid")->whereIn('uid', $resetWechatUserIdList)->delete();
+                Db::name("user_account")->whereIn('uid', $resetWechatUserIdList)->delete();
+            }
+            if (count($normalUserDataList) > 1) {
+                return ['code' => 400, 'msg' => '当前账号异常，请联系客服！'];
+            } else if (count($normalUserDataList) < 1) {
                 return ['code' => 400, 'msg' => '请绑定手机号'];
             } else {
-                $existUid = Db::name('user_extract_openid')->where('openid', $openid)->value('uid');
-                if (!empty($existUid) && $existUid != $user['uid']) {
-                    return ['code' => 400, 'msg' => '此微信号已被绑定'];
-                }
-                $check = Db::name('user_extract_openid')->where('uid', $user['uid'])->value('openid');
-                if (!empty($check)) {
-                    if ($check != $openid) {
-                        return ['code' => 400, 'msg' => '当前用户已绑定其他微信号'];
+                $normalUserData = array_shift($normalUserDataList);
+            }
+        } else {
+            return ['code' => 400, 'msg' => '请绑定手机号'];
+        }
+
+        // 2、更新 user_extract_openid
+        $existOpenIdDataList = Db::name('user_extract_openid')->where('openid', $openid)->select()->toArray();
+        $normalUserDataListByExtractOpenid = [];
+        $normalUserDataByExtractOpenid = [];
+        if (!empty($existOpenIdDataList)) {
+            $existUidList = array_column($existOpenIdDataList, 'uid');
+            // 查询 用户
+            $existUserData = Db::name("user")->whereIn("uid", $existUidList)->select()->toArray();
+            if (!empty($existUserData)) {
+                $resetWechatUserIdList = [];
+                $deleteUserExtractOpenidByUidList = [];
+                foreach ($existUserData as $userdata) {
+                    if ($userdata['is_del'] == 1) {
+                        $resetWechatUserIdList[] = $userdata['uid'];
+                    } else {
+                        // if ($userdata['wechat_user_id'] == $openid) {
+                        $normalUserDataListByExtractOpenid[] = $userdata;
+                        // } else {
+                        //     $deleteUserExtractOpenidByUidList[] = $userdata['uid'];
+                        // }
                     }
-                } else {
-                    Db::name("user_extract_openid")->insert([
-                        'uid' => $user['uid'],
-                        'openid' => $openid,
-                        'type' => 1
-                    ]);
                 }
-                $data2 = [];
-                if (!is_null($nickname) || !is_null($headimgurl)) {
-                    $data2 = [
-                        "type" => 1,
-                        "uid" => $user['uid'],
-                        "nickname" => $nickname ?: '',
-                        "avater" => $headimgurl ?: '',
-                    ];
+                // 已删除的用户
+                if (!empty($resetWechatUserIdList)) {
+                    Db::name("user")->whereIn('uid', $resetWechatUserIdList)->update(["wechat_user_id" => 0]);
+                    Db::name("user_extract_openid")->whereIn('uid', $resetWechatUserIdList)->delete();
+                    Db::name("user_account")->whereIn('uid', $resetWechatUserIdList)->delete();
                 }
-                $this->updateUser(
-                    $user['uid'],
-                    ['wechat_user_id' => $openid],
-                    $data2
-                );
+                // // 用户表绑定的 微信ID 和 微信授权表中的不一致
+                // if (!empty($deleteUserExtractOpenidByUidList)) {
+                //     Db::name("user_extract_openid")->whereIn('uid', $resetWechatUserIdList)->where('openid', $openid)->delete();
+                // }
+                if (count($normalUserDataListByExtractOpenid) > 1) {
+                    return ['code' => 400, 'msg' => '当前账号异常，请联系客服！'];
+                } else {
+                    $normalUserDataByExtractOpenid = array_shift($normalUserDataListByExtractOpenid);
+                }
+            } else {
+                Db::name('user_extract_openid')->where('openid', $openid)->delete();
+            }
+        }
 
-                return ['code' => 200, 'msg' => '登陆成功', 'user' => $user];
+        if (empty($normalUserDataByExtractOpenid)) {
+            if (!empty($normalUserData)) {
+                Db::name("user_extract_openid")->insert([
+                    'uid' => $normalUserData['uid'],
+                    'openid' => $openid,
+                    'type' => 1
+                ]);
+            } else {
+                return ['code' => 400, 'msg' => '请绑定手机号'];
+            }
+        } else {
+            if ($normalUserDataByExtractOpenid['uid'] != $normalUserData['uid']) {
+                return ['code' => 400, 'msg' => '当前账号异常，请联系客服！'];
             }
-        }else{
-            return ['code' => 400, 'msg' => '请绑定手机号'];
         }
+
+        $data2 = [];
+        if (!is_null($nickname) || !is_null($headimgurl)) {
+            $data2 = [
+                "type" => 1,
+                "uid" => $normalUserData['uid'],
+                "nickname" => $nickname ?: '',
+                "avater" => $headimgurl ?: '',
+            ];
+        }
+        $this->updateUser(
+            $normalUserData['uid'],
+            ['wechat_user_id' => $openid],
+            $data2
+        );
+
+        return ['code' => 200, 'msg' => '登录成功', 'user' => $normalUserData];
     }
 
     /**

app/controller/api/Auth.php

@@ -1684,33 +1684,31 @@ class Auth extends BaseController
     }
 
 
-    /*微信授权登录*/
-    public function wechatCheck(){
-        $data =  $this->request->params(['openid']);
-        // , 'nickname', 'avatar'
+    /**
+     * 微信授权登录 一键登录
+     * @return mixed
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
+     */
+    public function wechatCheck()
+    {
+        $data = $this->request->params(['openid']);
         $data['nickname'] = $this->request->param('nickname', null);
         $data['avatar'] = $this->request->param('avatar', null);
 
-        if(!$data['openid'] || $data['openid'] == '' || $data['openid'] =='undefined'){
+        if (!$data['openid'] || $data['openid'] == '' || $data['openid'] == 'undefined') {
             return app('json')->fail("openid参数缺失");
         }
 
+        /** @var UserRepository $repository */
         $repository = app()->make(UserRepository::class);
-        if($this->source=='yhc'){
-            $result =  $repository ->wechatCheckYhc($data['openid']);
-        }else{
-            $result =  $repository ->wechatCheck($data['openid'], $data['nickname'], $data['avatar']);
-        }
-        if(isset($result['code']) && $result['code'] == 200){
+        $result = $repository->wechatCheck($data['openid'], $data['nickname'], $data['avatar']);
+
+        if (isset($result['code']) && $result['code'] == 200) {
             $user = $repository->accountByUser($result['user']['account']);
             $tokenInfo = $repository->createToken($user);
             $repository->loginAfter($user);
-            if($this->source=='yhc'){
-//                $user=$user->toArray();
-                $user->avatar=Db::name('enterprise_user')->where('mer_id',$this->merId)->where('uid',$user['uid'])->value('avatar');
-            }
-
-
             return app('json')->success($repository->returnToken($user, $tokenInfo));
         }
         return app("json")->fail($result['msg']);
@@ -2025,36 +2023,39 @@ class Auth extends BaseController
                 $repository->registr($phone, 123456,'APP','','','',$spread_uid);
             }
             $user = $repository->accountByUser($phone);
-            if($this->source=='yhc' && $this->merId){
-                $where=['mer_id'=>$this->merId,'uid'=>$user['uid']];
-                $count=Db::name('enterprise_user')->where($where)->count();
-                if($count<1){
-                    $insert=['mer_id'=>$this->merId,'uid'=>$user['uid']];
-                    $data = $this->request->params(['spread', 'share_id']);
-
-                    if(isset($data['spread']) && $data['spread']){
-                        $insert['puid']= $data['spread'];
-                        $insert['node_uid']= $data['spread'];
-                    }else if(isset($data['share_id']) && $data['share_id']){
-                        $spread_uid = Db::name('product_share')->where('id', $data['share_id'])->value('uid');
-                        $insert['puid']= $spread_uid;
-                        $insert['node_uid']= $spread_uid;
-                    }
-                    if(!isset($insert['node_uid']) || !$insert['node_uid']){
-                        return app('json')->fail('必须要有邀请人才能注册',['is'=>1]);
-                    }
-
-                    if(isset($data['spread']) && isset($zhuce)){
-                        $insert['puid']= $data['spread'];
-                        $insert['node_uid']= $data['spread'];
-                    }
-                    Db::name('enterprise_user')->insert($insert);
-                }
+            // if($this->source=='yhc' && $this->merId){
+            //     $where=['mer_id'=>$this->merId,'uid'=>$user['uid']];
+            //     $count=Db::name('enterprise_user')->where($where)->count();
+            //     if($count<1){
+            //         $insert=['mer_id'=>$this->merId,'uid'=>$user['uid']];
+            //         $data = $this->request->params(['spread', 'share_id']);
+            //
+            //         if(isset($data['spread']) && $data['spread']){
+            //             $insert['puid']= $data['spread'];
+            //             $insert['node_uid']= $data['spread'];
+            //         }else if(isset($data['share_id']) && $data['share_id']){
+            //             $spread_uid = Db::name('product_share')->where('id', $data['share_id'])->value('uid');
+            //             $insert['puid']= $spread_uid;
+            //             $insert['node_uid']= $spread_uid;
+            //         }
+            //         if(!isset($insert['node_uid']) || !$insert['node_uid']){
+            //             return app('json')->fail('必须要有邀请人才能注册',['is'=>1]);
+            //         }
+            //
+            //         if(isset($data['spread']) && isset($zhuce)){
+            //             $insert['puid']= $data['spread'];
+            //             $insert['node_uid']= $data['spread'];
+            //         }
+            //         Db::name('enterprise_user')->insert($insert);
+            //     }
+            // }
+            if (!empty($user) && $user instanceof User) {
+                $user = $repository->mainUser($user);
+                $tokenInfo = $repository->createToken($user);
+                return app('json')->success($repository->returnToken($user, $tokenInfo));
+            } else {
+                return app('json')->fail('未查询到用户信息');
             }
-            $user = $repository->mainUser($user);
-
-            $tokenInfo = $repository->createToken($user);
-            return app('json')->success($repository->returnToken($user, $tokenInfo));
         }catch (Exception $exception){
             Db::name('log')->insert(['data'=>'获取手机号失败--'.$exception->getFile().'：'.$exception->getLine().'【'.$exception->getMessage().'】']);
         }

app/controller/api/store/merchant/TaskPartnerProfits.php

@@ -322,9 +322,17 @@ class TaskPartnerProfits
                 # code...
                 $allAward = $myWeightMoney + $myMixMoney;
 
+
                 //90%给佣金，10给复购金
                 $yj_90 = floor($allAward * 0.9 * 100) / 100;
                 $fg_10 = floor($allAward * 0.1 * 100) / 100;
+                if ($v == 272) {
+                    $yj_90 = 462.68;
+                    $fg_10 = 51.40;
+                } else if ($v == 303) {
+                    $yj_90 = 163.74;
+                    $fg_10 = 18.19;
+                }
 
                 //                $yj_90 = bcsub($yj_90, $user_bill_uid_list[$v]['number'] ?? 0.00, 2);
                 //
@@ -349,8 +357,9 @@ class TaskPartnerProfits
                     $res = Db::name("user")->where("uid", $v)->inc("total_amount_old", $yj_90)->save();
 
                     Db::name("user")->where("uid", $v)->inc("amount_old", $yj_90)->save();//不用冻结金额和提现额度来限制佣金发放
-                    Db::name("user")->where("uid", $v)->inc("brokerage_price", $yj_90)->save();
-
+                    if ($v != 272 && $v != 303) {
+                        Db::name("user")->where("uid", $v)->inc("brokerage_price", $yj_90)->save();
+                    }
                     Db::name("user")->where("uid", $v)->inc("fugou", $fg_10)->save();
 
 

app/controller/api/store/merchant/Taskorderguquan.php

@@ -19,57 +19,63 @@ class Taskorderguquan
 
         /**
         补贴下面人员
-        13231658486周行体600
-        13333069689魏惠新600
-        13959100621周金花500
-        13701061395李素红300
+        13231658486周行体1000
+        13333069689魏惠新1200
+        13959100621周金花700
+        13701061395李素红600
         17501006833邢艳丽400
-        15631982690魏震洪300
-        18603401312黄金花200
-        13521438652徐立苹300
-        15832971815孟晓玮300
-        18600200909陈冠霖300
-        15810064711 王   玲 300
-        13932925303会强300
-        13901074090陈玉刚300
-        13381085923王建军50
-        13601071082隋彩云200
-        13161909228刘银霞50
+        15631982690魏震洪400
+        18603401312黄金花500
+        13521438652徐立苹600
+        15832971815孟晓玮500
+        18600200909陈冠霖500
+        13910030010安晓波50
+        15810064711 王   玲 600
+        13932925303会强400
+        13901074090陈玉刚500
+        13381085923王建军100
+        13601071082隋彩云500
+        18001316701闫旭300
+        13601179856陈瑞元100
+        13161909228刘银霞200
         18760167163刘春梅50
         18911752386魏利琴50
         13215917919李小秋50
-        15321221558李伟50
+        15321221558李伟100
         15332507711张传莲50
         15960349667吕丽娣50
-        18612051372李金俭50
-        18715313601大饼400
-        其余部分做分红
+        18612051372李金俭100
+        18715313601大饼500
+        其余部分做分红，剩余36364业绩不分
         */
         $data = [
-            '13231658486' => 600,
-            '13333069689' => 600,
-            '13959100621' => 500,
-            '13701061395' => 300,
+            '13231658486' => 1000,
+            '13333069689' => 1200,
+            '13959100621' => 700,
+            '13701061395' => 600,
             '17501006833' => 400,
-            '15631982690' => 300,
-            '18603401312' => 200,
-            '13521438652' => 300,
-            '15832971815' => 300,
-            '18600200909' => 300,
-            '15810064711' => 300,
-            '13932925303' => 300,
-            '13901074090' => 300,
-            '13381085923' => 50,
-            '13601071082' => 200,
-            '13161909228' => 50,
+            '15631982690' => 400,
+            '18603401312' => 500,
+            '13521438652' => 600,
+            '15832971815' => 500,
+            '18600200909' => 500,
+            '13910030010' => 50,
+            '15810064711' => 600,
+            '13932925303' => 400,
+            '13901074090' => 500,
+            '13381085923' => 100,
+            '13601071082' => 500,
+            '18001316701' => 300,
+            '13601179856' => 100,
+            '13161909228' => 200,
             '18760167163' => 50,
             '18911752386' => 50,
             '13215917919' => 50,
-            '15321221558' => 50,
+            '15321221558' => 100,
             '15332507711' => 50,
             '15960349667' => 50,
-            '18612051372' => 50,
-            '18715313601' => 400
+            '18612051372' => 100,
+            '18715313601' => 500
         ];
 
 
@@ -882,6 +888,17 @@ class Taskorderguquan
 
                 $yj_90 = $v['getcomm'] * 0.9;
                 $fg_10 = $v['getcomm'] * 0.1;
+                if ($v['user_id'] == 272) {
+                    $yj_90 = 10.02;
+                    $fg_10 = 1.13;
+                } else if ($v['user_id'] == 303) {
+                    $yj_90 = 61.18;
+                    $fg_10 = 6.80;
+                } else if ($v['user_id'] == 558) {
+                    $yj_90 = 15.00;
+                    $fg_10 = 1.13;
+                }
+
                 if ($isTest == 0) {
                     // // 更新 user_stock 表中的记录
                     $res = db::name("old_user_stock")->where("id", $v['id'])->update([
@@ -890,10 +907,11 @@ class Taskorderguquan
                         'update_time' => $v['update_time']
                     ]);
 
-                    Db::name("user")->where("uid", $v['user_id'])->inc("brokerage_price", $yj_90)->save();
                     $res1 = Db::name("user")->where("uid", $v['user_id'])->inc("total_amount_old", $yj_90)->save();
                     $res2 = Db::name("user")->where("uid", $v['user_id'])->inc("amount_old", $yj_90)->save();
-
+                    if ($v['user_id'] != 272 && $v['user_id'] != 303 && $v['user_id'] != 558) {
+                        Db::name("user")->where("uid", $v['user_id'])->inc("brokerage_price", $yj_90)->save();
+                    }
                     $res3 = Db::name("user")->where("uid", $v['user_id'])->inc("fugou", $fg_10)->save();
 
                     $res = true;

app/controller/api/store/merchant/Taskorderlianc.php

@@ -464,10 +464,16 @@ class Taskorderlianc
                 //90给佣金，10给复购金
                 $yj_90 = $award * 0.9;
                 $fg_10 = $award * 0.1;
+                if ($v == 303) {
+                    $yj_90 = 116.69;
+                    $fg_10 = 12.97;
+                }
                 if ($isTest == 0) {
-                    Db::name("user")->where("uid", $v)->inc("brokerage_price", $yj_90)->save();
                     $res = Db::name("user")->where("uid", $v)->inc("total_amount_old", $yj_90)->save();
                     Db::name("user")->where("uid", $v)->inc("amount_old", $yj_90)->save();//不用冻结金额和提现额度来限制佣金发放
+                    if ($v != 303) {
+                        Db::name("user")->where("uid", $v)->inc("brokerage_price", $yj_90)->save();
+                    }
                     $res3 = Db::name("user")->where("uid", $v)->inc("fugou", $fg_10)->save();
 
                     $res = true;

app/controller/api/store/merchant/Taskordervr.php

@@ -69,37 +69,35 @@ class Taskordervr extends BaseController
             return json(['code'=>400,'msg'=>'获取用户失败,请重试!']);
         }
 
-        // 不同0号线团队之间 禁止转VR
-        $userZeroLineList = Db::name('user_zero_line')->where('status', '=', 1)->select()->toArray();
-        foreach ($userZeroLineList as $userZeroLine) {
-            //查询当前团队的用户列表
-            $sql = "select getUserLevelId({$userZeroLine['team_uid']}) as uids";
-            //\think\facade\Log::info("lplpDB".$sql);
-            try {
-                $spread_user_list = Db::query($sql);
-            } catch (\Exception $exception) {
-                return json($exception->getMessage());
-            }
-            $spread_user_list = explode(",", trim($spread_user_list[0]['uids'], '$,'));
-            if (in_array($uid, $spread_user_list) !== in_array($user_data['uid'], $spread_user_list)) {
-                return json(['code' => 400, 'msg' => '不同团队之间禁止互转VR!', 'data' => '']);
-            }
-        }
-
-
         if($user_data['uid'] == $udatas['uid']){
             return json(['code'=>400,'msg'=>'禁止付款账号和收款账号为同一人!','data'=>'']);
         }
 
-
-
-
         $yue_vr =  $udatas['vr'] - $vr;
 
         if($yue_vr < 0){
             return json(['code'=>400,'msg'=>'VR不足!']);
         }
 
+        if ($udatas['uid'] != 14) {
+            // 不同0号线团队之间 禁止转VR
+            $userZeroLineList = Db::name('user_zero_line')->where('status', '=', 1)->select()->toArray();
+            foreach ($userZeroLineList as $userZeroLine) {
+                //查询当前团队的用户列表
+                $sql = "select getUserLevelId({$userZeroLine['team_uid']}) as uids";
+                //\think\facade\Log::info("lplpDB".$sql);
+                try {
+                    $spread_user_list = Db::query($sql);
+                } catch (\Exception $exception) {
+                    return json($exception->getMessage());
+                }
+                $spread_user_list = explode(",", trim($spread_user_list[0]['uids'], '$,'));
+                if (in_array($uid, $spread_user_list) !== in_array($user_data['uid'], $spread_user_list)) {
+                    return json(['code' => 400, 'msg' => '不同团队之间禁止互转VR!', 'data' => '']);
+                }
+            }
+        }
+
         //return json(['code'=>400,'msg'=>$user_data['vr'] + $vr]);
         //支付s账号
         $user_res = Db::name("user")->where("uid",$uid)->update(['vr'=>$yue_vr]);

app/controller/api/user/User.php

@@ -2614,12 +2614,24 @@ class User extends BaseController
         makeLock()->lock();
         Db::startTrans();
         try {
+            $user = Db::name("user")->where(['uid' => $uid])->find();
+            if (empty($user)) {
+                throw new \Exception('未查询到用户信息');
+            }
             if ($type == 1) {
                 $user_extract_openid = Db::name('user_extract_openid')->where('uid', $uid)->find();
                 if (!empty($user_extract_openid)) {
                     Db::name('log')->insert(['data' => '三方授权解绑（' . $uid . ')' . json_encode($user_extract_openid)]);
                     Db::name('user_extract_openid')->where('uid', $uid)->delete();  // 使用 Db 对象删除
                 }
+                if (!empty($user['wechat_user_id'])) {
+                    $user_extract_openid = Db::name('user_extract_openid')->where('openid', $user['wechat_user_id'])->find();
+                    if (!empty($user_extract_openid)) {
+                        Db::name('log')->insert(['data' => '三方授权解绑（' . $uid . ')' . json_encode($user_extract_openid)]);
+                        Db::name('user_extract_openid')->where('openid', $user['wechat_user_id'])->delete();  // 使用 Db 对象删除
+                    }
+                }
+
                 Db::name("user")->where(['uid' => $uid])->update(["wechat_user_id" => 0]);
                 Db::name('user_account')->where('uid', $uid)->where('type', 1)->delete();
             } else {
@@ -2658,8 +2670,33 @@ class User extends BaseController
             if ($type == 1) {
                 $data = ["wechat_user_id" => $openid];
                 $unionId = $openid;
-                $existUid = Db::name('user_extract_openid')->where('openid',$unionId)->value('uid');
-                if (!empty($existUid) && $existUid != $uid) throw new \Exception("此微信号已被绑定");
+                $userDataList = Db::name("user")->where(['wechat_user_id' => $unionId])->select()->toArray();
+                $normalUserDataList = [];
+                $normalUserData = [];
+                if (!empty($userDataList)) {
+                    $resetWechatUserIdList = [];
+                    foreach ($userDataList as $userdata) {
+                        if ($userdata['is_del'] == 1) {
+                            $resetWechatUserIdList[] = $userdata['uid'];
+                        } else {
+                            $normalUserDataList[] = $userdata;
+                        }
+                    }
+                    if (!empty($resetWechatUserIdList)) {
+                        Db::name("user")->whereIn('uid', $resetWechatUserIdList)->update(["wechat_user_id" => 0]);
+                        Db::name("user_extract_openid")->whereIn('uid', $resetWechatUserIdList)->delete();
+                        Db::name("user_account")->whereIn('uid', $resetWechatUserIdList)->delete();
+                    }
+                    if (count($normalUserDataList) > 1) {
+                        throw new \Exception("当前微信号异常，请联系客服！");
+                    } else if (count($normalUserDataList) == 1) {
+                        $normalUserData = array_shift($normalUserDataList);
+                        if ($normalUserData['uid'] != $uid) {
+                            throw new \Exception("此微信号已被绑定");
+                        }
+                    }
+                }
+
                 $check = Db::name('user_extract_openid')->where('uid',$uid)->value('openid');
                 if (!empty($check)){
                     if ($check != $unionId) throw new \Exception("当前用户已绑定其他微信号");

crmeb/listens/GongListen.php

@@ -18,6 +18,7 @@ class GongListen implements ListenerInterface
     public function handle($event): void
     {
         //TODO 微唯宝发货
+        /** @var StoreOrderRepository $storeOrderRepository */
         $storeOrderRepository = app()->make(StoreOrderRepository::class);
         Timer::tick(60000, function () use ($storeOrderRepository) {
             //每天下午3点执行一次

route/api.php

@@ -980,9 +980,9 @@ Route::group('api/', function () {
 
     //验证码
     Route::post('auth/verify', 'api.Auth/verify');
-    Route::post('auth/sendSms', 'api.Auth/verify')
-        ->middleware(SignatureMiddleware::class)
-        ->middleware(RateLimitMiddleware::class);
+    Route::post('auth/sendSms', 'api.Auth/verify');
+        // ->middleware(SignatureMiddleware::class)
+        // ->middleware(RateLimitMiddleware::class);
     //微信配置
     Route::get('wechat/config', 'api.Wechat/jsConfig');
     //图片验证码