From 89b00738329409c174582672a2bfb7712d54952d Mon Sep 17 00:00:00 2001
From: shengchanzhe <179998674@qq.com>
Date: Mon, 25 Dec 2023 17:02:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=95=86=E5=93=81=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../store/order/StoreOtherOrderRepository.php     | 15 ---------------
 app/controller/api/Common.php                     | 13 +++++++++++++
 route/api.php                                     |  1 +
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/app/common/repositories/store/order/StoreOtherOrderRepository.php b/app/common/repositories/store/order/StoreOtherOrderRepository.php
index 8d6a19e0..4f935036 100644
--- a/app/common/repositories/store/order/StoreOtherOrderRepository.php
+++ b/app/common/repositories/store/order/StoreOtherOrderRepository.php
@@ -218,12 +218,6 @@ class StoreOtherOrderRepository extends BaseRepository
                     'user_type' => $storeOrderStatusRepository::U_TYPE_USER,
                 ];
 
-                if ($order->order_type == 0) {
-                    //发起队列物流信息处理
-                    //event('order.sendGoodsCode', $order);
-                    Queue::push(SendGoodsCodeJob::class, $order);
-                }
-
                 // 商户流水账单数据
                 $finance[] = [
                     'order_id' => $order->order_id,
@@ -351,18 +345,9 @@ class StoreOtherOrderRepository extends BaseRepository
             }
             $financialRecordRepository->insertAll($finance);
             $storeOrderStatusRepository->batchCreateLog($orderStatus);
-            if (count($groupOrder['give_coupon_ids']) > 0)
-                $groupOrder['give_coupon_ids'] = app()->make(StoreCouponRepository::class)->getGiveCoupon($groupOrder['give_coupon_ids'])->column('coupon_id');
             $groupOrder->save();
         });
 
-        if (count($groupOrder['give_coupon_ids']) > 0) {
-            try {
-                Queue::push(PayGiveCouponJob::class, ['ids' => $groupOrder['give_coupon_ids'], 'uid' => $groupOrder['uid']]);
-            } catch (Exception $e) {
-            }
-        }
-
         Queue::push(SendSmsJob::class, ['tempId' => 'ORDER_PAY_SUCCESS', 'id' => $groupOrder->group_order_id]);
         Queue::push(SendSmsJob::class, ['tempId' => 'ADMIN_PAY_SUCCESS_CODE', 'id' => $groupOrder->group_order_id]);
         Queue::push(UserBrokerageLevelJob::class, ['uid' => $groupOrder->uid, 'type' => 'pay_money', 'inc' => $groupOrder->pay_price]);
diff --git a/app/controller/api/Common.php b/app/controller/api/Common.php
index 680bd4fe..1ba6ea6d 100644
--- a/app/controller/api/Common.php
+++ b/app/controller/api/Common.php
@@ -32,6 +32,8 @@ use app\common\repositories\user\UserSignRepository;
 use app\common\repositories\user\UserVisitRepository;
 use app\common\repositories\wechat\TemplateMessageRepository;
 use app\common\repositories\wechat\WechatUserRepository;
+use app\common\repositories\store\product\ProductLabelRepository;
+
 use app\common\model\system\merchant\Merchant;
 use crmeb\basic\BaseController;
 use crmeb\services\AlipayService;
@@ -593,4 +595,15 @@ class Common extends BaseController
 
         }
      }
+
+    /**
+     * 商品标签
+     */
+    public function label_lst(ProductLabelRepository $repository)
+    {
+        [$page, $limit] = $this->getPage();
+        $where = $this->request->params(['name', 'type', 'status']);
+        $data  = $repository->getList($where,$page, $limit);
+        return app('json')->success($data);
+    }
 }
diff --git a/route/api.php b/route/api.php
index 7296ca0b..9c82c21e 100644
--- a/route/api.php
+++ b/route/api.php
@@ -21,6 +21,7 @@ use think\facade\Route;
 
 Route::group('api/', function () {
     Route::any('test', 'api.Auth/test');
+    Route::get('label_lst', 'api.Common/label_lst');
     Route::any('system_group_value', 'api.Common/system_group_value');
     Route::any('demo_ceshi', 'api.Demo/index');
     Route::any('dotest', 'api.Auth/dotest');