From ec9febfebad1a0f9b3b2497297af94ada724671b Mon Sep 17 00:00:00 2001
From: xucong <850806214@qq.com>
Date: Sun, 11 Aug 2024 17:28:02 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=9C=AC=E5=9C=B0=E7=94=9F=E6=B4=BB=E4=B8=8A?=
 =?UTF-8?q?=E7=BA=A7=E5=88=97=E8=A1=A8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/LocalStore.php | 2 +-
 app/api/logic/PayLogic.php        | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/api/controller/LocalStore.php b/app/api/controller/LocalStore.php
index 9de1b0dd..58ee3ca1 100755
--- a/app/api/controller/LocalStore.php
+++ b/app/api/controller/LocalStore.php
@@ -209,7 +209,7 @@ class LocalStore extends Api
         $result = Db::name('local_store')
             ->where(['lstore_id' => $id, 'user_id' => $this->user_id, 'store_state' => 1])
             ->order('create_time', 'desc')
-            ->field('lstore_id, store_state, header_image, store_nickname, pay_image')
+            ->field('lstore_id, store_state, header_image, store_nickname, pay_image,shopName,shopLogo')
             ->find();
         if ($result) {
             $result['header_image'] = FileConfig::get('aliyunoss.domain') . 'local_life_shop/' . $result['header_image'] ;
diff --git a/app/api/logic/PayLogic.php b/app/api/logic/PayLogic.php
index ed34a9d1..5dd70008 100755
--- a/app/api/logic/PayLogic.php
+++ b/app/api/logic/PayLogic.php
@@ -708,6 +708,7 @@ class PayLogic extends Logic
         $dt['create_time'] = date("Y-m-d H:i:s");
         $dt['user_id'] = $user_id;
         $dt['pay_shop_type'] = 1;
+        $dt['state'] = 1;
         $r = Db::name("local_store_order")->save($dt);
         if (!$r) {
             Db::rollback();
@@ -723,6 +724,7 @@ class PayLogic extends Logic
         $dt1['separate_account'] = round($post['money']*0.08,2);
         $dt1['create_time'] = date("Y-m-d H:i:s");
         $dt1['user_id'] = $user_id;
+        $dt1['state'] = 1;
         $r1 = Db::name("local_store_order")->save($dt1);
         if (!$r1) {
             Db::rollback();
@@ -738,6 +740,7 @@ class PayLogic extends Logic
         $dt2['separate_account'] = round($post['money']*0.22,2);
         $dt2['create_time'] = date("Y-m-d H:i:s");
         $dt2['user_id'] = $user_id;
+        $dt2['state'] = 1;
         $r2 = Db::name("local_store_order")->save($dt2);
         if (!$r2) {
             Db::rollback();
@@ -753,6 +756,7 @@ class PayLogic extends Logic
         $dt3['separate_account'] = round($post['money']*0.1,2);
         $dt3['create_time'] = date("Y-m-d H:i:s");
         $dt3['user_id'] = $user_id;
+        $dt3['state'] = 1;
         $r3 = Db::name("local_store_order")->save($dt3);
         if (!$r3) {
             Db::rollback();