From 15cc0a40dcea1586abc2e1b979f223fa28cd22c3 Mon Sep 17 00:00:00 2001
From: wang hou sheng <76928547+wanghousheng@users.noreply.github.com>
Date: Thu, 16 May 2024 12:29:08 +0800
Subject: [PATCH] 1

---
 app/admin/controller/Wxserve.php       | 13 ++++++------
 app/common/library/wxserver/Server.php | 29 ++++++++++++++++++++++++--
 2 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/app/admin/controller/Wxserve.php b/app/admin/controller/Wxserve.php
index ff2d5f42..bffaeaeb 100644
--- a/app/admin/controller/Wxserve.php
+++ b/app/admin/controller/Wxserve.php
@@ -229,13 +229,12 @@ class Wxserve extends Controller
         $obj = new Server();
         $res = $obj->privacyInfo($appid);
         if ($res == 'ok') {
-            $result = $obj->submitAudit($appid);
-            return $this->renderSuccess([$result]);
-//            if ($result) {
-//                return $this->renderSuccess('success');
-//            } else {
-//                return $this->renderSuccess([])
-//            }
+            $result = $obj->submitAuditOne($appid);
+            if ($result['status']) {
+                return $this->renderSuccess('success');
+            } else {
+                return $this->renderError($result['msg']);
+            }
         } else {
             return $this->renderError('隐私接口错误');
         }
diff --git a/app/common/library/wxserver/Server.php b/app/common/library/wxserver/Server.php
index 3d56e087..830ee6d2 100644
--- a/app/common/library/wxserver/Server.php
+++ b/app/common/library/wxserver/Server.php
@@ -698,7 +698,33 @@ class Server
         return 0;
     }
 
-    public function submitAudit($appid)
+    public function submitAuditOne($appid): array
+    {
+        $access_token = $this->authorizerAccessToken($appid);
+        if ($access_token) {
+            $url = 'https://api.weixin.qq.com/wxa/submit_audit?access_token=' . $access_token;
+            $data['item_list'] = $this->getAllCategory($appid);
+            if (!empty($data['item_list'])) {
+                $data = '{}';
+            } else {
+                $data = json_encode($data);
+            }
+            $result = $this->curlPost($url, $data);
+            $result = json_decode($result, true);
+            if (!empty($result) && intval($result['errcode']) == 0 && !empty($result['auditid'])) {
+                $model = new WxserverAccount();
+                $up['audit_status'] = 1;
+                $up['audit_reason'] = '';
+                $up['audit_time'] = date('Y-m-d H:i:s');
+                $up['auditid'] = $result['auditid'];
+                $model->update($up, ['appid' => $appid]);
+                return ['status' => true, 'msg' => 'success'];
+            }
+        }
+        return ['status' => false, 'msg' => !empty($result['errmsg']) ? $result['errmsg'] : '位置错误'];
+    }
+
+    public function submitAudit($appid): bool
     {
         $access_token = $this->authorizerAccessToken($appid);
         if ($access_token) {
@@ -711,7 +737,6 @@ class Server
             }
             $result = $this->curlPost($url, $data);
             $result = json_decode($result, true);
-            return $result;
             if (!empty($result) && intval($result['errcode']) == 0 && !empty($result['auditid'])) {
                 $model = new WxserverAccount();
                 $up['audit_status'] = 1;