From cb92924616c512d2d6536edd029672b682dd0c23 Mon Sep 17 00:00:00 2001
From: linyaostalker <602604991@qq.com>
Date: Fri, 20 Dec 2019 08:58:59 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=E5=BC=80=E5=8F=91=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E8=8F=9C=E5=8D=95=E6=8E=A7=E5=88=B6=E5=99=A8=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controllers/PublicAccountController.php     | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/backend/modules/wx_public_account/controllers/PublicAccountController.php b/backend/modules/wx_public_account/controllers/PublicAccountController.php
index aa76aad..51be015 100644
--- a/backend/modules/wx_public_account/controllers/PublicAccountController.php
+++ b/backend/modules/wx_public_account/controllers/PublicAccountController.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace backend\modules\wechat_public_account\controllers;
+namespace backend\modules\wx_public_account\controllers;
 
 use Yii;
 use yii\web\Controller;
 use yii\filters\VerbFilter;
-use backend\modules\shop\models\ars\Config;
-use backend\modules\wechat_public_account\logic\PublicAccountManager;
+use backend\modules\wx_public_account\models\ars\WxPublicAccountConfig;
+use backend\modules\wx_public_account\logic\PublicAccountManager;
 
 /**
  * PublicAccountController manage WeChat public account platform.
@@ -31,17 +31,24 @@ class PublicAccountController extends Controller
     /**
      * Lists all AfterSale models.
      * @return mixed
+     * @throws \yii\web\ServerErrorHttpException
      */
     public function actionCustomMenu()
     {
-        $config = Config::find()->one();
+        $wxPublicAccountConfig = WxPublicAccountConfig::find()->one();
         if (Yii::$app->request->isPost) {
             Yii::$app->response->format = 'json';
             $data = Yii::$app->request->post('data');
+            $res = PublicAccountManager::dealCustomMenuData($data, $wxPublicAccountConfig);
+            if ($res) {
+                return ['status' => true];
+            } else {
+                return ['status' => false, 'info' => $res['info']];
+            }
         }
         return $this->render('custom_menu', [
             'customPageList' => [],
-            'data' => $config->menu_setting ?: '[]'
+            'data' => $wxPublicAccountConfig->menu_setting ?: '[]'
         ]);
     }
 }