From cae380f93e77e949a70a6a1e8e9e6153a057038a Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Fri, 17 Nov 2023 14:20:29 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E7=94=B2=E6=96=B9=E5=85=AC=E5=8F=B8=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/middleapi/controller/CompanyController.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/app/middleapi/controller/CompanyController.php b/app/middleapi/controller/CompanyController.php
index 1e55c1c00..0312fda80 100644
--- a/app/middleapi/controller/CompanyController.php
+++ b/app/middleapi/controller/CompanyController.php
@@ -415,4 +415,20 @@
 			}
 
 		}
+
+		public function getPartyA()
+		{
+			if(!$this->request->isPost()){
+				return $this->fail('请求方式错误');
+			}
+			$companyId = $this->request->param('company_id');
+			if(empty($companyId)){
+				return $this->fail('缺少公司id');
+			}
+			$re = CompanyLogic::getPartyA($companyId);
+			if ($re === false) {
+				return $this->fail(CompanyLogic::getError());
+			}
+			return $this->success('成功', $re);
+		}
 	}
\ No newline at end of file

From 4e48919944ded68cc76d6380771efa53b59bc7ca Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Fri, 17 Nov 2023 16:19:46 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=85=AC=E5=8F=B8?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8chax?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/middleapi/controller/CompanyController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/middleapi/controller/CompanyController.php b/app/middleapi/controller/CompanyController.php
index 0312fda80..07f2c74fc 100644
--- a/app/middleapi/controller/CompanyController.php
+++ b/app/middleapi/controller/CompanyController.php
@@ -32,7 +32,7 @@
 			$params=$this->request->post(['page_no','page_size','company_name','area_name','street_name','area_manager','company_type','is_contract']);
 			$where = [];
 			if(!empty($params['company_name'])){
-				$where[] = ['company','like','%'.$params['company_name'].'%'];
+				$where[] = ['company_name','like','%'.$params['company_name'].'%'];
 			}
 			if(!empty($params['area_name'])){
 				$arr= Db::name('geo_area')->where('area_name','like','%'.$params['area_name'].'%')->column('area_code');

From 35de09d2731d899b2554b09cce917a433809f9bf Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Fri, 17 Nov 2023 16:39:49 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=85=BC=E5=AE=B9?=
 =?UTF-8?q?=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/adminapi/logic/recharge/RechargeLogic.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/adminapi/logic/recharge/RechargeLogic.php b/app/adminapi/logic/recharge/RechargeLogic.php
index d269dc9b0..5dc065b6b 100755
--- a/app/adminapi/logic/recharge/RechargeLogic.php
+++ b/app/adminapi/logic/recharge/RechargeLogic.php
@@ -99,11 +99,13 @@ class RechargeLogic extends BaseLogic
             ]);
 
             // 更新用户余额及累计充值金额
-            User::where(['id' => $order['user_id']])
-                ->dec('total_recharge_amount', $order['order_amount'])
-                ->dec('user_money', $order['order_amount'])
-                ->update();
-
+            $userInfo = User::where(['id' => $order['user_id']])->findOrEmpty();
+            if ($userInfo['total_recharge_amount'] >= $order['order_amount']) {
+                User::where(['id' => $order['user_id']])
+                    ->dec('total_recharge_amount', $order['order_amount'])
+                    ->dec('user_money', $order['order_amount'])
+                    ->update();
+            }
             // 记录日志
             AccountLogLogic::add(
                 $order['user_id'],