From 6ba04b1b2cd4b03696be6a5aac7f3023acb1ac13 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Tue, 19 Sep 2023 11:34:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/adminapi/controller/CompanyController.php |  1 +
 app/api/controller/ApproveController.php      | 56 +++---------------
 app/api/lists/approve/ApproveLists.php        |  4 +-
 app/common/logic/approve/ApproveLogic.php     | 59 +++++++++++++++++++
 4 files changed, 71 insertions(+), 49 deletions(-)
 create mode 100644 app/common/logic/approve/ApproveLogic.php

diff --git a/app/adminapi/controller/CompanyController.php b/app/adminapi/controller/CompanyController.php
index 934954679..2a48e052f 100644
--- a/app/adminapi/controller/CompanyController.php
+++ b/app/adminapi/controller/CompanyController.php
@@ -389,6 +389,7 @@ class CompanyController extends BaseAdminController
             $data = [
                 'mer_intention_id' => $params['mer_intention_id']??'', // 商城商户入驻申请id，签约完成后回调使用
                 'company_name' => $params['company_name']??'',
+                'mer_name' => $params['mer_name']??'', // 店铺名称
                 'organization_code' => $params['organization_code']??'',
                 'city' => $params['city']??'',
                 'area' => $params['area']??'',
diff --git a/app/api/controller/ApproveController.php b/app/api/controller/ApproveController.php
index 6fb2d390a..8122764bd 100644
--- a/app/api/controller/ApproveController.php
+++ b/app/api/controller/ApproveController.php
@@ -3,6 +3,7 @@
 namespace app\api\controller;
 
 use app\api\lists\approve\ApproveLists;
+use app\common\logic\approve\ApproveLogic;
 use app\common\model\Approve;
 use Symfony\Component\HttpClient\HttpClient;
 use think\Exception;
@@ -32,57 +33,16 @@ class ApproveController extends BaseApiController
             if (!$approve) {
                 throw new Exception('数据不存在');
             }
-            Db::startTrans();
-
-            // 拒绝通过
-            if ($params['check_status'] == 3) {
-                if (empty($params['remark'])) {
-                    throw new Exception('请输入拒绝理由');
-                }
-                $this->refuse($approve, $params);
-            }
-            // 修改任务完成状态
-            if ($params['check_status'] == 2) {
-                $this->pass($approve);
-            }
-
-            // 回调商城,通知审核状态
-            if (in_array($approve['type'], [2, 3])) {
-                $shopMerchantInfo = json_decode($approve['extend'], true);
-                self::shopCallBack($approve, $shopMerchantInfo, $params);
-            }
-            Db::commit();
-            return $this->fail('操作成功');
+            ApproveLogic::audit($approve, $params);
+            return $this->success('操作成功');
         } catch (Exception $exception) {
-            Db::rollback();
-            return $this->fail('审核失败');
+            return $this->fail(ApproveLogic::getError() ?? $exception->getMessage());
         }
     }
-
-    private static function pass(Approve $approve)
+    public function detail()
     {
-        $approve->check_status = 2;
-        $approve->save();
-    }
-
-    private static function refuse(Approve $approve, $params)
-    {
-        $approve->check_status = 3;
-        $approve->remard = $params['remark'];
-        $approve->save();
-    }
-
-    private static function shopCallBack(Approve $approve, $shopMerchantInfo, $params)
-    {
-        $status = $params['check_status'] == 2? 1: 2;
-        if ($params['check_status'] == 3) {
-            $status = 2;
-        }
-        // 通知商城审批状态
-        $requestResponse = HttpClient::create()->request('POST', env('url.shop_prefix') . '/api/merchant/syncStatus/'.$shopMerchantInfo['mer_intention_id'], [
-            'body' => ['status' => $status, 'type' => $approve['type']]
-        ]);
-
-
+        $param = $this->request->param();
+        $detail = ApproveLogic::detail($param['id']);
+        return $this->success('成功', $detail);
     }
 }
\ No newline at end of file
diff --git a/app/api/lists/approve/ApproveLists.php b/app/api/lists/approve/ApproveLists.php
index 976b52007..7136f75a1 100644
--- a/app/api/lists/approve/ApproveLists.php
+++ b/app/api/lists/approve/ApproveLists.php
@@ -43,7 +43,7 @@ class ApproveLists extends BaseApiDataLists implements ListsSearchInterface
 
     public function lists(): array
     {
-         return Approve::where($this->searchWhere)
+          Approve::where($this->searchWhere)
             ->where($this->queryWhere())
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
@@ -52,6 +52,8 @@ class ApproveLists extends BaseApiDataLists implements ListsSearchInterface
              })
             ->select()
             ->toArray();
+          dd((new Approve())->getLastSql());
+        return [];
     }
 
 
diff --git a/app/common/logic/approve/ApproveLogic.php b/app/common/logic/approve/ApproveLogic.php
new file mode 100644
index 000000000..4af6d202a
--- /dev/null
+++ b/app/common/logic/approve/ApproveLogic.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace app\common\logic\approve;
+
+use app\common\logic\BaseLogic;
+use app\common\model\Approve;
+use Symfony\Component\HttpClient\HttpClient;
+use think\facade\Db;
+
+class ApproveLogic extends BaseLogic
+{
+    public static function audit($approve, $params)
+    {
+        // 拒绝通过
+        if ($params['check_status'] == 3) {
+            if (empty($params['remark'])) {
+                self::setError('请输入拒绝理由');
+            }
+            self::refuse($approve, $params);
+        }
+        // 修改任务完成状态
+        if ($params['check_status'] == 2) {
+            self::pass($approve);
+        }
+
+        // 回调商城,通知审核状态
+        if (in_array($approve['type'], [2, 3])) {
+            $shopMerchantInfo = json_decode($approve['extend'], true);
+            self::shopCallBack($approve, $shopMerchantInfo, $params);
+        }
+    }
+
+    private static function pass(Approve $approve)
+    {
+        $approve->check_status = 2;
+        $approve->save();
+    }
+
+    private static function refuse(Approve $approve, $params)
+    {
+        $approve->check_status = 3;
+        $approve->remard = $params['remark'];
+        $approve->save();
+    }
+
+    private static function shopCallBack(Approve $approve, $shopMerchantInfo, $params)
+    {
+        $status = $params['check_status'] == 2? 1: 2;
+        // 通知商城审批状态
+        $requestResponse = HttpClient::create()->request('POST', env('url.shop_prefix') . '/api/merchant/syncStatus/'.$shopMerchantInfo['mer_intention_id'], [
+            'body' => ['status' => $status, 'type' => $approve['type']]
+        ]);
+    }
+
+    public static function detail($id)
+    {
+        return Approve::where(['id', $id])->find();
+    }
+}
\ No newline at end of file