From 75c6e3b05a4823458003a3abee08573e84ef6314 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sat, 13 Jul 2024 11:22:12 +0800
Subject: [PATCH] =?UTF-8?q?feat(UserLogic):=20=E4=BC=98=E5=8C=96=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=9C=B0=E5=9D=80=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/logic/user/UserLogic.php           | 16 +++++-----------
 app/api/controller/store/StoreController.php | 13 ++++++++++---
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/app/admin/logic/user/UserLogic.php b/app/admin/logic/user/UserLogic.php
index 50a6ef4ac..309d4ddc1 100644
--- a/app/admin/logic/user/UserLogic.php
+++ b/app/admin/logic/user/UserLogic.php
@@ -84,26 +84,20 @@ class UserLogic extends BaseLogic
                 self::setError('请设置村参数');
                 return false;
             }
-            $arr=User::where('user_ship',$user_ship)->column('id');
-            if($arr){
-                $find=UserAddress::where('uid','in',$arr)->where('village',$params['village'])->find();
-                if($find){
+            $arr=User::where('user_ship',$user_ship)->alias('user')->join('user_address address','user.id=address.uid and village='.$params['village'])->find();
+            if ($arr) {
                     self::setError('该区域已有村长请重新选择');
                     return false;
-                }
             }
         }elseif($user_ship==3){
             if(!isset($params['brigade'])){
                 self::setError('请设置队参数');
                 return false;
             }
-            $arr=User::where('user_ship',$user_ship)->column('id');
+            $arr=User::where('user_ship',$user_ship)->alias('user')->join('user_address address','user.id=address.uid and village='.$params['village'] .' and brigade='.$params['brigade'])->find();
             if($arr){
-                $find=UserAddress::where('uid','in',$arr)->where('village',$params['village'])->where('brigade',$params['brigade'])->find();
-                if($find){
-                    self::setError('该区域已有队长请重新选择');
-                    return false;
-                }
+                self::setError('该区域已有队长请重新选择');
+                return false;
             }
         }
         return true;
diff --git a/app/api/controller/store/StoreController.php b/app/api/controller/store/StoreController.php
index 81c64b52a..0c53a9303 100644
--- a/app/api/controller/store/StoreController.php
+++ b/app/api/controller/store/StoreController.php
@@ -66,8 +66,8 @@ class StoreController extends BaseApiController
         $params = (new UserValidate())->post()->goCheck('rechargeStoreMoney');
         $auth_code = $this->request->post('auth_code'); //微信支付条码
         $recharge_type = $this->request->post('recharge_type',''); //微信支付条码
-        $code = $this->request->post('code','');//验证码
-        $phone = $params['mobile'];
+        // $code = $this->request->post('code','');//验证码
+        // $phone = $params['mobile'];
 //        if($code && $phone){
 //            $remark = $phone.'_reporting';
 //            $codeCache = Cache::get($remark);
@@ -84,12 +84,18 @@ class StoreController extends BaseApiController
         $find=User::where('account|mobile',$params['mobile'])->find();
         if(!$find){
             $params['create_uid']=$this->userId;
+            if(isset($params['user_ship']) && in_array($params['user_ship'],[2,3])){
+                UserUserLogic::checkAddress($params);
+                if(UserUserLogic::hasError()){
+                    return $this->fail(UserUserLogic::getError());
+                }
+            }
             $find=UserUserLogic::StoreAdd($params);
             if(UserUserLogic::hasError()){
                 return $this->fail(UserUserLogic::getError());
             }
         }else{
-            if(isset($params['type']) && $params['type'] != 2){
+            if($find['user_ship']!=$params['user_ship'] && in_array($params['user_ship'],[2,3])){
                 UserUserLogic::checkAddress($params);
                 if(UserUserLogic::hasError()){
                     return $this->fail(UserUserLogic::getError());
@@ -130,6 +136,7 @@ class StoreController extends BaseApiController
             'recharge_type'=>'INDUSTRYMEMBERS',
             'user_ship'=>$params['user_ship']??0,
         ];
+        d(123123);
         $order = UserRecharge::create($data);
 
         $order['pay_price']=$order['price'];