From 2bcee04f20c7c225a3f01e5bf961369d3739fb3b Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Fri, 23 Feb 2024 14:28:44 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E9=A2=84=E5=94=AE=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0=E5=85=B3=E9=94=AE=E5=AD=97?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/store/product/StoreProductPresell.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controller/api/store/product/StoreProductPresell.php b/app/controller/api/store/product/StoreProductPresell.php
index 291cdc18..77465157 100755
--- a/app/controller/api/store/product/StoreProductPresell.php
+++ b/app/controller/api/store/product/StoreProductPresell.php
@@ -37,7 +37,7 @@ class StoreProductPresell extends BaseController
     public function lst()
     {
         [$page, $limit] = $this->getPage();
-        $where = $this->request->params([['type',4],'star','mer_id']);
+        $where = $this->request->params([['type',4],'star','mer_id', 'keyword']);
         return app('json')->success($this->repository->getApiList($where,$page, $limit));
     }
 

From b8014f70dd2d5f3916365c000e101f03417b8fe6 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Fri, 23 Feb 2024 16:41:49 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8A=B5=E6=89=A3?=
 =?UTF-8?q?=E7=BA=A2=E5=8C=85=E4=BD=BF=E7=94=A8=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repositories/store/order/StoreOrderCreateRepository.php   | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/common/repositories/store/order/StoreOrderCreateRepository.php b/app/common/repositories/store/order/StoreOrderCreateRepository.php
index e2523944..3769d88e 100755
--- a/app/common/repositories/store/order/StoreOrderCreateRepository.php
+++ b/app/common/repositories/store/order/StoreOrderCreateRepository.php
@@ -643,10 +643,6 @@ class StoreOrderCreateRepository extends StoreOrderRepository
             $allow_no_address = false;
         }
 
-        if (isset($this->store_consumption_user['type']) && $this->store_consumption_user['type'] == 2 && $order_total_price >= 6 && $this->payType == 'balance') {
-            throw new ValidateException('余额支付时，不能使用抵扣红包');
-        }
-
         $consumptionTotal = 0;
         $consumptionUsed = 0;
         $groupOrderPayPrice = 0;

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 3/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=95=86=E6=88=B7?=
 =?UTF-8?q?=E7=94=B3=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';

From 1347db1771a2576e7b55f909d2b0a285228736ef Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Sat, 24 Feb 2024 15:58:51 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81webp?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/upload.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/upload.php b/config/upload.php
index 4b28e997..240ad772 100755
--- a/config/upload.php
+++ b/config/upload.php
@@ -19,7 +19,7 @@ return [
     //上传文件大小
     'filesize' => 52428800,
     //上传文件后缀类型
-    'fileExt' => ['jpg', 'jpeg', 'png', 'gif', 'pem', 'mp3', 'wma', 'wav', 'amr', 'mp4', 'key', 'xlsx', 'xls', 'ico', 'apk', 'ipa','wgt','zip'],
+    'fileExt' => ['jpg', 'jpeg', 'png', 'gif', 'pem', 'mp3', 'wma', 'wav', 'amr', 'mp4', 'key', 'xlsx', 'xls', 'ico', 'apk', 'ipa','wgt','zip','webp'],
     //上传文件类型
     'fileMime' => ['image/jpeg', 'image/gif', 'image/png', 'text/plain', 'audio/mpeg', 'image/vnd.microsoft.icon','application/widget','application/zip'],
     //驱动模式