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

返回商户

Browse Source
This commit is contained in:
liu 2024-03-18 15:53:04 +08:00
parent 15100521cc
commit 4547634f0e
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/common/repositories/store/order/StoreOrderRepository.php
View File

@ -2593,7 +2593,7 @@ class StoreOrderRepository extends BaseRepository
public function dealGoodsList($where,$money) public function dealGoodsList($where,$money,$merId)
{ {
//拆分2种方式 大于该金额的 50 +小于该金额的50条 //拆分2种方式 大于该金额的 50 +小于该金额的50条
$greaterWhere = function ($query) use ($money) { $greaterWhere = function ($query) use ($money) {
@ -2610,6 +2610,7 @@ class StoreOrderRepository extends BaseRepository
$count = count($list); $count = count($list);
$minMoney = bcsub($money, 600, 2); $minMoney = bcsub($money, 600, 2);
$merInfo = Merchant::getDB()->where('mer_id',$merId)->value('mer_name');
if ($count) { if ($count) {
$range = $this->getRangeNumber($minMoney); //减少一般的区间 $range = $this->getRangeNumber($minMoney); //减少一般的区间
//不存在--虚假的区间 //不存在--虚假的区间
@ -2640,10 +2641,10 @@ class StoreOrderRepository extends BaseRepository
// $count = array_sum(array_column($list, 'num')); //重复拿 // $count = array_sum(array_column($list, 'num')); //重复拿
$count = count($list);//计算数量的 $count = count($list);//计算数量的
return compact('count', 'list'); return compact('count', 'list','merInfo');
} else { } else {
return compact('count', 'list'); return compact('count', 'list','merInfo');
} }
} }

2
app/controller/api/store/order/StoreOrder.php
View File

@ -325,7 +325,7 @@ class StoreOrder extends BaseController
"p.is_gift_bag" => 0 "p.is_gift_bag" => 0
]; ];
return app('json')->success($this->repository->dealGoodsList($where,$money)); return app('json')->success($this->repository->dealGoodsList($where,$money,$merId));
} }