mkm/shop-php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整商户申请查询

Browse Source
This commit is contained in:
luofei 2024-02-24 11:06:18 +08:00
parent b8014f70dd
commit bb28766036
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controller/admin/system/merchant/MerchantIntention.php
View File

@ -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));
}

1
crmeb/listens/OrderDeliveryListen.php
View File

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