From ebde5684c0decd063420d7e34fe129aad53ad4ad Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Wed, 3 Jul 2024 17:25:57 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=A7=BB=E9=99=A4=E4=BA=86UserLogic?=
=?UTF-8?q?=E4=B8=AD=E7=9A=84=E5=86=97=E4=BD=99=E4=BB=A3=E7=A0=81=EF=BC=8C?=
=?UTF-8?q?=E5=B9=B6=E5=B0=86=E7=9B=B8=E5=85=B3=E9=80=BB=E8=BE=91=E7=A7=BB?=
=?UTF-8?q?=E8=87=B3UserShipLogic=E4=B8=AD=EF=BC=8C=E4=BB=A5=E6=8F=90?=
=?UTF-8?q?=E9=AB=98=E4=BB=A3=E7=A0=81=E5=8F=AF=E8=AF=BB=E6=80=A7=E5=92=8C?=
=?UTF-8?q?=E5=8F=AF=E7=BB=B4=E6=8A=A4=E6=80=A7=E3=80=82=E5=90=8C=E6=97=B6?=
=?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=88=A4=E6=96=AD=E6=98=AF?=
=?UTF-8?q?=E5=90=A6=E6=9C=89=E6=9D=91=E9=95=BF=E6=88=96=E5=AF=B9=E9=95=BF?=
=?UTF-8?q?=E7=9A=84API=E6=8E=A5=E5=8F=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/admin/logic/user/UserLogic.php | 18 ------------
app/admin/logic/user_ship/UserShipLogic.php | 28 +++++++++++++++++++
.../user_ship/UserShipController.php | 11 +++++++-
3 files changed, 38 insertions(+), 19 deletions(-)
diff --git a/app/admin/logic/user/UserLogic.php b/app/admin/logic/user/UserLogic.php
index 7f0a9be3f..43aeec3c0 100644
--- a/app/admin/logic/user/UserLogic.php
+++ b/app/admin/logic/user/UserLogic.php
@@ -78,24 +78,6 @@ class UserLogic extends BaseLogic
public static function StoreAdd(array $params)
{
- $user_ship=$params['user_ship']??0;
- if($user_ship==2){
- $arr=User::where('user_ship',$user_ship)->column('id');
- if($arr){
- $find=UserAddress::where('uid','in',$arr)->where('village',$params['village'])->find();
- if($find){
- self::setError('该区域又有村长请重新选择');
- }
- }
- }elseif($user_ship==3){
- $arr=User::where('user_ship',$user_ship)->column('id');
- if($arr){
- $find=UserAddress::where('uid','in',$arr)->where('brigade',$params['brigade'])->find();
- if($find){
- self::setError('该区域已有对长请重新选择');
- }
- }
- }
$passwordSalt = Config::get('project.unique_identification');
$password = create_password(123456, $passwordSalt);
$defaultAvatar = config('project.default_image.admin_avatar');
diff --git a/app/admin/logic/user_ship/UserShipLogic.php b/app/admin/logic/user_ship/UserShipLogic.php
index 0166b1a84..9d6880ae0 100644
--- a/app/admin/logic/user_ship/UserShipLogic.php
+++ b/app/admin/logic/user_ship/UserShipLogic.php
@@ -5,6 +5,8 @@ namespace app\admin\logic\user_ship;
use app\common\model\user_ship\UserShip;
use app\common\logic\BaseLogic;
+use app\common\model\user\User;
+use app\common\model\user\UserAddress;
use think\facade\Db;
@@ -95,4 +97,30 @@ class UserShipLogic extends BaseLogic
{
return UserShip::findOrEmpty($params['id'])->toArray();
}
+
+ /**
+ * 判断是否有村长或者对长
+ * @param $params array 参数数组
+ */
+ public static function user_ship($params){
+ $user_ship=$params['user_ship']??0;
+ if($user_ship==2){
+ $arr=User::where('user_ship',$user_ship)->column('id');
+ if($arr){
+ $find=UserAddress::where('uid','in',$arr)->where('village',$params['village'])->find();
+ if($find){
+ self::setError('该区域又有村长请重新选择');
+ }
+ }
+ }elseif($user_ship==3){
+ $arr=User::where('user_ship',$user_ship)->column('id');
+ if($arr){
+ $find=UserAddress::where('uid','in',$arr)->where('brigade',$params['brigade'])->find();
+ if($find){
+ self::setError('该区域已有对长请重新选择');
+ }
+ }
+ }
+ }
+
}
\ No newline at end of file
diff --git a/app/api/controller/user_ship/UserShipController.php b/app/api/controller/user_ship/UserShipController.php
index f6b2b9c42..3e6afa1b9 100644
--- a/app/api/controller/user_ship/UserShipController.php
+++ b/app/api/controller/user_ship/UserShipController.php
@@ -2,7 +2,7 @@
namespace app\api\controller\user_ship;
-
+use app\admin\logic\user_ship\UserShipLogic;
use app\api\controller\BaseApiController;
use app\common\lists\user\UserShipLists;
@@ -28,4 +28,13 @@ class UserShipController extends BaseApiController
}
+ public function is_user_ship(){
+ $data=$this->request->post();
+ UserShipLogic::user_ship($data);
+ if(UserShipLogic::hasError()){
+ return $this->fail(UserShipLogic::getError());
+ }else{
+ return $this->success('ok');
+ }
+ }
}
\ No newline at end of file