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

更新审核

Browse Source
This commit is contained in:
yaooo 2023-08-22 11:59:43 +08:00
parent 5589e8e69e
commit 556fc46dc2
3 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
app/controller/api/Auth.php
View File

@ -930,5 +930,42 @@ class Auth extends BaseController
return app('json')->success($data);
}
//根据地址信息查询订单列表
public function orderList()
{
[$page, $limit] = $this->getPage();
$cityCode = $this->request->param('city_code', '');
$districtCode = $this->request->param('district_code', '');
$streetCode = $this->request->param('street_code');
$villageCode = $this->request->param('village_code', '');
$brigadeId = $this->request->param('brigade_id', -1);
$startDate = $this->request->param('start_date', date('Y-m-d'));
$endDate = $this->request->param('end_date', date('Y-m-d'));
$queryBuilder = Db::name('ProductOrderLog')->where('status', 1);
if ($cityCode) {
$queryBuilder = $queryBuilder->where('city_code', $cityCode);
}
if ($districtCode) {
$queryBuilder = $queryBuilder->where('district_code', $districtCode);
}
if ($streetCode) {
$queryBuilder = $queryBuilder->where('street_code', $streetCode);
}
if ($villageCode) {
$queryBuilder = $queryBuilder->where('village_code', $villageCode);
}
if ($brigadeId) {
$queryBuilder = $queryBuilder->where('brigade_id', $brigadeId);
}
if ($startDate) {
$queryBuilder = $queryBuilder->whereTime('create_time', '>=', trim($startDate));
}
if ($endDate) {
$queryBuilder = $queryBuilder->whereTime('create_time', '<=', trim($endDate) . ' 23:59:59');
}
$count = $queryBuilder->count();
$list = $queryBuilder->setOption('field', [])->field([''])->order('id', 'desc')->page($page, $limit)->fetchSql(false)->select();
return app('json')->success(compact('count', 'list'));
}
}

2
app/controller/api/community/Community.php
View File

@ -499,7 +499,7 @@ class Community extends BaseController
$queryBuilder->where('c.status', 1);
}
$count = $queryBuilder->count();
$list = $queryBuilder->setOption('field', [])->field(['c.community_id', 'c.title', 'c.image', 'c.resale_type', 'SUM(`r`.`number` * `r`.`price`) AS total_price', 'SUM(`r`.`number` * `r`.`price` * (100 - `r`.`float_rate`) / 100) AS discount_price'])->group('c.community_id')->order('c.community_id', 'desc')->page($page, $limit)->fetchSql(false)->select();
$list = $queryBuilder->setOption('field', [])->field(['c.community_id', 'c.title', 'c.image', 'c.resale_type', 'c.mer_status', 'SUM(`r`.`number` * `r`.`price`) AS total_price', 'SUM(`r`.`number` * `r`.`price` * (100 - `r`.`float_rate`) / 100) AS discount_price'])->group('c.community_id')->order('c.community_id', 'desc')->page($page, $limit)->fetchSql(false)->select();
if ($list) $list = $list->toArray();
foreach($list as $k=>&$v) {
$list[$k]['discount_price'] = round($v['discount_price'], 2);

1
route/api.php
View File

@ -24,6 +24,7 @@ Route::group('api/', function () {
Route::any('dotest', 'api.Auth/dotest');
Route::post('goods/take/:id', 'api.Auth/deliveryGoods');
Route::get('order/statistics', 'api.Auth/orderStatistics');
Route::get('order/list', 'api.Auth/orderList');
Route::resource('upload', 'api.Upload');
Route::post('articleCatch', 'api.Upload/article');
//强制登录