From 70fbe1ed9f9156a03d298e53c67d6d41b1bd42a0 Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Mon, 18 Sep 2023 14:30:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=95=86=E6=88=B7=E4=BA=A4?=
 =?UTF-8?q?=E6=98=93=E7=94=B3=E8=AF=B7=E5=8D=8F=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/repositories/system/CacheRepository.php | 3 ++-
 app/controller/api/Auth.php                        | 8 ++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/common/repositories/system/CacheRepository.php b/app/common/repositories/system/CacheRepository.php
index 0a3bbd1d..cff3e1e8 100644
--- a/app/common/repositories/system/CacheRepository.php
+++ b/app/common/repositories/system/CacheRepository.php
@@ -77,7 +77,7 @@ class CacheRepository extends BaseRepository
             ['label' => '平台规则',        'key' => self::PLATFORM_RULE],
             ['label' => '注销重要提示',     'key' => self::CANCELLATION_PROMPT],
             ['label' => '商户入驻申请协议', 'key' => self::INTEGRAL_AGREE],
-            ['label' => '交易申请协议', 'key' => self::BUSINESS_APPLY_AGREE],
+            ['label' => '交易申请协议',     'key' => self::BUSINESS_APPLY_AGREE],
         ];
         if (!$type) {
             $data[] = ['label' => '注销声明', 'key' => self::CANCELLATION_MSG];
@@ -91,6 +91,7 @@ class CacheRepository extends BaseRepository
         return [
             self::INTEGRAL_RULE,
             self::INTEGRAL_AGREE,
+            self::BUSINESS_APPLY_AGREE,
             self::PRESELL_AGREE,
             self::WECHAT_MENUS,
             self::RECEIPT_AGREE,
diff --git a/app/controller/api/Auth.php b/app/controller/api/Auth.php
index 94ff747b..4948acb3 100644
--- a/app/controller/api/Auth.php
+++ b/app/controller/api/Auth.php
@@ -209,18 +209,14 @@ class Auth extends BaseController
         $store_service = Db::name('store_service')->where('uid', $data['uid'])->find();
         
         if ($store_service) {
-            $mer_arr = Db::name('merchant')->where('mer_id', $store_service['mer_id'])->where('is_del', 0)->field('type_id,mer_avatar,mer_banner,mer_info,category_id,service_phone,mer_address,uid,mer_name,create_time,update_time')->find();
+            $mer_arr = Db::name('merchant')->where('mer_id', $store_service['mer_id'])->where('is_del', 0)->field('type_id,mer_avatar,mer_banner,business_status,mer_info,category_id,service_phone,mer_address,uid,mer_name,create_time,update_time')->find();
             if ($mer_arr && $mer_arr['mer_avatar'] != '' && $mer_arr['mer_banner'] != '' && $mer_arr['mer_info'] && $mer_arr['service_phone'] != '' && $mer_arr['mer_address'] != '') {
                 $data['is_wsxx'] = 1;
             }
             $data['mer_info'] = $mer_arr;
             $typCode = Db::name('merchant_type')->where('mer_type_id', $mer_arr['type_id'] ?? 0)->value('type_code');
             $data['mer_info']['type_code'] = $typCode;
-            if (($mer_arr['create_time'] ?? '') ==  ($mer_arr['update_time'] ?? '')) {
-                $data['mer_info']['setup_status'] = 0;
-            } else {
-                $data['mer_info']['setup_status'] = 1;
-            }
+            // 交易申请状态：0未申请 1申请中 2申请通过 3申请拒绝
         }
         $data['fan_num']   = app()->make(RelevanceRepository::class)->getUserFans($user->uid, 1, 1, 1);
         $data['focus_num'] = app()->make(RelevanceRepository::class)->getUserFocus($user->uid, 1, 1, 1);