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-13 15:23:08 +08:00
parent c5dfa55a94
commit 11628d38d3
2 changed files with 9 additions and 6 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

@ -2444,14 +2444,15 @@ class StoreOrderRepository extends BaseRepository
{
$uid = Merchant::getDB()->where(['mer_id'=>$merId,'is_del'=>0])->value('uid');
$data = StoreOrder::getDB()->alias('o')
->leftJoin('Merchant m', 'o.mer_id = m.mer_id');
->leftJoin('Merchant m', 'o.mer_id = m.mer_id')
->leftJoin('User u', 'o.mer_id = m.mer_id');
if (isset($where['section_startTime']) && $where['section_startTime'] && isset($where['section_endTime']) && $where['section_endTime']) {
$data->whereTime('o.create_time', 'between', [$where['section_startTime'], $where['section_endTime']]);
}
$data->where(function ($query) use ($where,$uid,$merId) {
$query->where('o.mer_id', $merId)->whereOr('o.uid', $uid);
})->where('o.source', 999);//只要扫码
$data->field('o.order_id,o.uid,o.mer_id,o.pay_price,m.mer_name');
$data->field('o.order_id,o.uid,o.mer_id,o.pay_price,m.mer_name,o.create_time,u.nickname');
$list = $data->order('o.create_time DESC')->page($page, $limit)->select();
$income = 0;
$outcome = 0;
@ -2459,9 +2460,11 @@ class StoreOrderRepository extends BaseRepository
if($value['mer_id'] == $merId){
$value['msg'] = "收入";
$income +=$value['pay_price'];
$value['come_msg'] = "来自".$value['nickname'];
}else{
$value['msg'] = "支出";
$outcome +=$value['pay_price'];
$value['come_msg'] = "给".$value['mer_name'];
}
}

8
app/controller/api/server/StoreOrder.php
View File

@ -68,10 +68,10 @@ class StoreOrder extends BaseController
[$page, $limit] = $this->getPage();
$where['section_startTime'] = $this->request->param('section_startTime');
$where['section_endTime'] = $this->request->param('section_endTime');
if(empty($where['section_startTime']) && empty($where['section_endTime'])){
$where['section_startTime'] = date('Y-m-d',time()).' 00:00:00';
$where['section_endTime'] = date('Y-m-d',time()).' 23:59:59';
}
// if(empty($where['section_startTime']) && empty($where['section_endTime'])){
// $where['section_startTime'] = date('Y-m-d',time()).' 00:00:00';
// $where['section_endTime'] = date('Y-m-d',time()).' 23:59:59';
// }
return app('json')->success($repository->revenueExpenditure($where, $page, $limit,$merId));
}