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/7] =?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/7] =?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/7] =?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'],

From ef8e453162862b7c9c140392044b44aae74ef590 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Fri, 17 Nov 2023 17:18:39 +0800
Subject: [PATCH 4/7] =?UTF-8?q?update=20app=E7=94=A8=E6=88=B7=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?group=5Fid=EF=BC=8C=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BB=BB=E5=8A=A1=E7=B1=BB=E5=9E=8Bcode?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/TaskController.php | 15 +++++++++++++++
 app/api/logic/UserLogic.php           |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/app/api/controller/TaskController.php b/app/api/controller/TaskController.php
index b209bc107..b2c284de2 100644
--- a/app/api/controller/TaskController.php
+++ b/app/api/controller/TaskController.php
@@ -69,6 +69,8 @@ class TaskController extends BaseApiController
         if (isset($param['status']) && $param['status'] > 0) {
             $where[] = ['status', '=', $param['status']];
         }
+        $serviceGroupTaskTypeList = DictData::where(['type_value' => 'task_type', 'status' => 1])->column('value', 'id');
+        $villageTaskTypeList = DictData::where(['type_value' => 'village_task_type', 'status' => 1])->column('value', 'id');
         $townTaskTypeList = DictData::where(['type_value' => 'town_task_type', 'status' => 1])->column('value', 'id');
         $townMarketingManagerTaskTypeList = DictData::where(['type_value' => 'town_task_type_marketing_director', 'status' => 1])->column('value', 'id');
 
@@ -78,6 +80,19 @@ class TaskController extends BaseApiController
             ->order(['id' => 'desc', 'status' => 'asc'])
             ->select()->toArray();
         foreach ($res as $k => $item) {
+            if (isset($serviceGroupTaskTypeList[$item['type']])) {
+                $res[$k]['task_type_value'] = $serviceGroupTaskTypeList[$item['type']];
+            }
+            if (isset($villageTaskTypeList[$item['type']])) {
+                $res[$k]['task_type_value'] = $villageTaskTypeList[$item['type']];
+            }
+            if (isset($townTaskTypeList[$item['type']])) {
+                $res[$k]['task_type_value'] = $townTaskTypeList[$item['type']];
+            }
+            if (isset($townMarketingManagerTaskTypeList[$item['type']])) {
+                $res[$k]['task_type_value'] = $townMarketingManagerTaskTypeList[$item['type']];
+            }
+
             if ($item['type'] == 33) {
                 $company = Company::where('id', $item['company_id'])->field('id,deposit,company_money,user_id,day_count,company_type,province,city,area,street,village,brigade,responsible_area')->find(); // 可能要判断预存金是否满足
                 $find = App(RemoteController::class)->shang_date_total_price($company,$param,$item['template_id']);
diff --git a/app/api/logic/UserLogic.php b/app/api/logic/UserLogic.php
index 87b827a91..8543a2ff6 100755
--- a/app/api/logic/UserLogic.php
+++ b/app/api/logic/UserLogic.php
@@ -76,7 +76,7 @@ class UserLogic extends BaseLogic
     public static function info(int $userId)
     {
         $user = User::where(['id' => $userId])->with(['company'])
-            ->field('id,sn,sex,is_new_user,account,nickname,real_name,avatar,mobile,create_time,user_money,deposit,income,admin_id,company_id,is_captain,province,province province_name,city,city city_name,area,area area_name,street,street street_name,village,village village_name,brigade,brigade brigade_name')
+            ->field('id,sn,sex,is_new_user,account,nickname,real_name,avatar,mobile,create_time,user_money,deposit,income,admin_id,company_id,is_captain,province,province province_name,city,city city_name,area,area area_name,street,street street_name,village,village village_name,brigade,brigade brigade_name, group_id')
             ->findOrEmpty();
         // $user['avatar'] = $user['avatar'] ? Request()->host() . $user['avatar'] : $user['avatar'];
         $user['day_money_count']=UserAccountLog::where(['user_id'=>$userId,'action'=>1])->whereDay('create_time')->sum('change_amount');

From 190128c91b6777eb1d00024534b99653d0aeb2ab Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Fri, 17 Nov 2023 17:20:41 +0800
Subject: [PATCH 5/7] =?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/middleapi/controller/RefundController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/middleapi/controller/RefundController.php b/app/middleapi/controller/RefundController.php
index 3faf053c4..011586c6a 100644
--- a/app/middleapi/controller/RefundController.php
+++ b/app/middleapi/controller/RefundController.php
@@ -5,6 +5,7 @@ namespace app\middleapi\controller;
 use app\adminapi\logic\finance\RefundLogic;
 use app\common\model\refund\RefundRecord;
 use app\common\controller\BaseLikeAdminController;
+use app\common\service\FileService;
 
 /**
  * 退款控制器

From 70f3e6d83eb27290c1f3654b4a7764fbbc48acb0 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Fri, 17 Nov 2023 17:46:49 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E5=85=A5=E8=82=A1=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/adminapi/controller/setting/dict/DictDataController.php | 6 ++++++
 app/adminapi/logic/setting/dict/DictDataLogic.php           | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/app/adminapi/controller/setting/dict/DictDataController.php b/app/adminapi/controller/setting/dict/DictDataController.php
index a7558ca72..ebc6c7602 100755
--- a/app/adminapi/controller/setting/dict/DictDataController.php
+++ b/app/adminapi/controller/setting/dict/DictDataController.php
@@ -107,4 +107,10 @@ class DictDataController extends BaseAdminController
         return $this->data($result);
     }
 
+    public function getShareholderMoneyTaskApproveTypeList()
+    {
+        $result = DictDataLogic::getShareholderMoneyTaskApproveTypeList();
+        return $this->data($result);
+    }
+
 }
\ No newline at end of file
diff --git a/app/adminapi/logic/setting/dict/DictDataLogic.php b/app/adminapi/logic/setting/dict/DictDataLogic.php
index aba36e2b2..69216068b 100755
--- a/app/adminapi/logic/setting/dict/DictDataLogic.php
+++ b/app/adminapi/logic/setting/dict/DictDataLogic.php
@@ -89,4 +89,9 @@ class DictDataLogic extends BaseLogic
     {
         return DictData::where(['type_value' => 'task_approve_type', 'status' => 1])->column('value');
     }
+
+    public static function getShareholderMoneyTaskApproveTypeList()
+    {
+        return DictData::where(['type_value' => 'shareholder_money_task_approve_type', 'status' => 1])->column('value');
+    }
 }
\ No newline at end of file

From 50ee9c728286583ddea22e635a9b41b528267a41 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Fri, 17 Nov 2023 18:47:14 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E5=85=A5=E8=82=A1=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/adminapi/controller/CompanyController.php b/app/adminapi/controller/CompanyController.php
index 518dcbd27..84d289b46 100644
--- a/app/adminapi/controller/CompanyController.php
+++ b/app/adminapi/controller/CompanyController.php
@@ -394,7 +394,7 @@ class CompanyController extends BaseAdminController
             } else {
                 // 根据street码查询所属镇农科公司
                 $company_select=Db::query("select * from la_company where company_type=:company_type and FIND_IN_SET(:street,responsible_area)", ['company_type' => 41,'street'=>$params['street']], true);
-                if(empty($company)) {
+                if(empty($company_select)) {
                     throw new Exception('当前区域无镇农科公司');
                 }
                 $company=$company_select[0];