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

Merge pull request 'dev' (#153) from dev into master

Browse Source 
Reviewed-on: #153
This commit is contained in:
mkm 2024-02-26 11:10:32 +08:00
commit 3f02fa00b3
5 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/common/repositories/store/order/StoreOrderCreateRepository.php
View File

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

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

2
app/controller/api/store/product/StoreProductPresell.php
View File

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

2
config/upload.php
View File

@ -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'],
//驱动模式

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