From 82318041d4eafb92ba21715877ea14ea7b4a64ab Mon Sep 17 00:00:00 2001
From: wanghongjun <1445693971@qq,com>
Date: Mon, 30 Oct 2023 10:47:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BC=81=E4=B8=9A=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../weliam_smartcity/web/controller/store/merchant.ctrl.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/weliam_smartcity/web/controller/store/merchant.ctrl.php b/addons/weliam_smartcity/web/controller/store/merchant.ctrl.php
index 2a0e297..113e159 100644
--- a/addons/weliam_smartcity/web/controller/store/merchant.ctrl.php
+++ b/addons/weliam_smartcity/web/controller/store/merchant.ctrl.php
@@ -308,6 +308,9 @@ class Merchant_WeliamController {
             $register['album'] = serialize($register['album']);
             $register['tag'] = serialize($register['tag']);
             $register['storename'] = trim($register['storename']);
+            $cc_id = $register['cc_id'];
+            $recommend = $register['recommend'];
+            unset($register['cc_id'],$register['recommend']);
             if (!empty($register['endtime'])) {
                 $register['endtime'] = strtotime($register['endtime']);
             }
@@ -393,7 +396,6 @@ class Merchant_WeliamController {
             $register['cloudspeaker'] = serialize($cloudspeaker);
             //消息推送设置
             $register['printing'] = serialize($_GPC['printing']);
-
             if ($id) {
                 //修改店铺信息
                 $result = Store::registerEditData($register, $id);
@@ -422,7 +424,7 @@ class Merchant_WeliamController {
             if ($noticeflag) {
                 Member::returnIdentity($oldMid);
             }
-            MerchantDataEnt::saveData($register,$id);
+            MerchantDataEnt::saveData(['cc_id' => $cc_id,'recommend' => $recommend],$id);
             if ($result) {
                 if (!empty($id)) {
                     //处理分类