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-22 11:59:48 +08:00
parent 618f9c3831
commit 19087229e4
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2681,16 +2681,20 @@ class StoreOrderRepository extends BaseRepository
$deal = $this->dealArr($list); $deal = $this->dealArr($list);
//平均2个左右 0 1 2 阶梯往上查寻找 //平均2个左右 0 1 2 阶梯往上查寻找
[$products, $minNum] = $this->getRange($deal, $range); [$products, $minNum] = $this->getRange($deal, $range);
$result = []; $list = [];
if (!empty($products)) { if (!empty($products)) {
$result = $this->findNearestPriceProduct($products, $money, $minNum); $list = $this->findNearestPriceProduct($products, $money, $minNum);
}
$count = count($list);//计算数量的
} }
$count = count($result);//计算数量的
return compact('count', 'result','merInfo');
} else { return [
return compact('count', 'list','merInfo'); 'count'=>$count,
} 'list'=>$list,
'merInfo'=>$merInfo,
];
} }
public function getRange($array, $range) public function getRange($array, $range)

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

@ -332,8 +332,6 @@ class StoreOrder extends BaseController
return app('json')->success($this->repository->beginMerchant($merId)); return app('json')->success($this->repository->beginMerchant($merId));
} }
$where = [ $where = [
"a.mer_id" => $merId, "a.mer_id" => $merId,
"p.is_show" => 1, "p.is_show" => 1,