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';