From bb28766036982342b59293ac3bcfeb3289755a6f Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Sat, 24 Feb 2024 11:06:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=95=86=E6=88=B7=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/admin/system/merchant/MerchantIntention.php | 2 +-
 crmeb/listens/OrderDeliveryListen.php                      | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/controller/admin/system/merchant/MerchantIntention.php b/app/controller/admin/system/merchant/MerchantIntention.php
index ef2222bf..33cf64f9 100755
--- a/app/controller/admin/system/merchant/MerchantIntention.php
+++ b/app/controller/admin/system/merchant/MerchantIntention.php
@@ -38,7 +38,7 @@ class MerchantIntention extends BaseController
     public function lst()
     {
         [$page, $limit] = $this->getPage();
-        $where = $this->request->params(['mer_name', 'status', 'date', 'keyword', 'mer_intention_id', 'category_id', 'type_id']);
+        $where = $this->request->params(['mer_name', 'status', 'date', 'keyword', 'mer_intention_id', 'category_id', 'type_id', 'type']);
         return app('json')->success($this->repository->getList($where, $page, $limit));
     }
 
diff --git a/crmeb/listens/OrderDeliveryListen.php b/crmeb/listens/OrderDeliveryListen.php
index bf994cc5..6640fc30 100644
--- a/crmeb/listens/OrderDeliveryListen.php
+++ b/crmeb/listens/OrderDeliveryListen.php
@@ -27,7 +27,6 @@ class OrderDeliveryListen implements ListenerInterface
             $repo->endTime = '2025-07-01';
             $repo->send($consumption, 1, $order['uid'], $order['group_order_id'], $order->total_price, StoreConsumptionUser::STATUS_UNUSED);
 
-            //TODO 当商户销售和购买达到指定金额后，激活抵扣补贴
             $consumption = StoreConsumption::where('type', StoreConsumption::TYPE_RECHARGE)->find();
             $repo->startTime = date('Y-m-d H:i:s');
             $repo->endTime = '2025-07-01';