From 9c5a923656bbaa37d65210d32cc200980230f7e2 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Sun, 28 Apr 2024 11:36:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E8=BF=90=E8=90=A5?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=20-=20=E5=95=86=E6=88=B7=E5=85=A5=E9=A9=BB?=
 =?UTF-8?q?=E9=82=80=E8=AF=B7=E7=A0=81=E7=94=9F=E6=88=90=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=EF=BC=8C=E6=89=80=E6=9C=89=E5=95=86=E6=88=B7=E9=82=80=E8=AF=B7?=
 =?UTF-8?q?=E7=A0=81=E6=A0=B9=E6=8D=AE=E7=B1=BB=E5=9E=8B=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=EF=BC=8C=E4=B8=8D=E5=9C=A8=E6=AF=8F=E4=B8=AA?=
 =?UTF-8?q?=E5=95=86=E6=88=B7=E7=B1=BB=E5=9E=8B=E5=8D=95=E7=8B=AC=E7=94=9F?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../marketing/AgentRepository.php             | 34 ++-----------------
 app/controller/api/Agent.php                  |  2 +-
 app/controller/api/Auth.php                   | 16 ++++-----
 .../exchangeQuota/OrderPaySuccessEvent.php    |  3 ++
 4 files changed, 14 insertions(+), 41 deletions(-)

diff --git a/app/common/repositories/marketing/AgentRepository.php b/app/common/repositories/marketing/AgentRepository.php
index ff0acdb..1830ddd 100644
--- a/app/common/repositories/marketing/AgentRepository.php
+++ b/app/common/repositories/marketing/AgentRepository.php
@@ -92,39 +92,9 @@ class AgentRepository extends BaseRepository{
                 $path = 'pages/agent/invite/index';
                 return app()->make(QrcodeService::class)->createQrCode($valueData,$path);
                 break;
-            case 'wine':
+            case 'merchant':
                 // 参数长度超过  简写：aid=agent_id；mt=merchant_type
-                $valueData = 'aid=' . $params['agent_id'].'&mt=3';
-                $path = 'pages/store/settled/index';
-                return app()->make(QrcodeService::class)->createQrCode($valueData,$path);
-                break;
-            case 'shopMer':
-                // 参数长度超过  简写：aid=agent_id；mt=merchant_type
-                $valueData = 'aid=' . $params['agent_id'].'&mt=1';
-                $path = 'pages/store/settled/index';
-                return app()->make(QrcodeService::class)->createQrCode($valueData,$path);
-                break;
-            case 'mer':
-                // 参数长度超过  简写：aid=agent_id；mt=merchant_type
-                $valueData = 'aid=' . $params['agent_id'].'&mt=0';
-                $path = 'pages/store/settled/index';
-                return app()->make(QrcodeService::class)->createQrCode($valueData,$path);
-                break;
-            case 'supermarket':
-                // 参数长度超过  简写：aid=agent_id；mt=merchant_type
-                $valueData = 'aid=' . $params['agent_id'].'&mt=4';
-                $path = 'pages/store/settled/index';
-                return app()->make(QrcodeService::class)->createQrCode($valueData,$path);
-                break;
-            case 'hall':
-                // 参数长度超过  简写：aid=agent_id；mt=merchant_type
-                $valueData = 'aid=' . $params['agent_id'].'&mt=6';
-                $path = 'pages/store/settled/index';
-                return app()->make(QrcodeService::class)->createQrCode($valueData,$path);
-                break;
-            case 'health':
-                // 参数长度超过  简写：aid=agent_id；mt=merchant_type
-                $valueData = 'aid=' . $params['agent_id'].'&mt=7';
+                $valueData = 'aid=' . $params['agent_id'].'&mt=' . $params['merchant_type'];
                 $path = 'pages/store/settled/index';
                 return app()->make(QrcodeService::class)->createQrCode($valueData,$path);
                 break;
diff --git a/app/controller/api/Agent.php b/app/controller/api/Agent.php
index 9b6dc15..4414b68 100644
--- a/app/controller/api/Agent.php
+++ b/app/controller/api/Agent.php
@@ -43,7 +43,7 @@ class Agent extends BaseController{
      */
     public function qrCodeInviteSupplier(){
         // 参数获取
-        $params = $this->request->params(['agent_id','type','level']);
+        $params = $this->request->params(['agent_id','type','level','merchant_type']);
         $qrcode = $this->repository->createQrCode($params);
 
         return app('json')->success(['qr_code' => $qrcode]);
diff --git a/app/controller/api/Auth.php b/app/controller/api/Auth.php
index f16aa04..e2394f0 100644
--- a/app/controller/api/Auth.php
+++ b/app/controller/api/Auth.php
@@ -165,15 +165,15 @@ class Auth extends BaseController
                 'brokerage_price'
             ]);
         $user->append([
-            'service',
+            // 'service',
             'topService',
-            // 'ruleService',
-            'shopMerService',
-            'supermarketService',
-            'smokeMerService',
-            'provinceService',
-            'hallService',
-            'HealthService',
+            'ruleService',
+            // 'shopMerService',
+            // 'supermarketService',
+            // 'smokeMerService',
+            // 'provinceService',
+            // 'hallService',
+            // 'HealthService',
             'total_collect_product',
             'total_collect_store',
             'total_coupon',
diff --git a/app/listener/exchangeQuota/OrderPaySuccessEvent.php b/app/listener/exchangeQuota/OrderPaySuccessEvent.php
index 94d7f30..2b0a553 100644
--- a/app/listener/exchangeQuota/OrderPaySuccessEvent.php
+++ b/app/listener/exchangeQuota/OrderPaySuccessEvent.php
@@ -44,6 +44,9 @@ class OrderPaySuccessEvent{
             }else if($groupOrder->activity_type == 34){
                 // 邀请码激活
                 $this->inviteCodeActivation($groupOrder);
+            }else if($groupOrder->activity_type == 35){
+                // 酒道馆进货订单  暂无处理
+
             }else{
                 // 其他订单
                 $this->orderPaySuccessHandle($groupOrder);