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:45:37 +08:00
parent fa26726a19
commit ded87e722b
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2444,20 +2444,22 @@ 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('User u', 'o.mer_id = m.mer_id');
->leftJoin('Merchant m', 'o.mer_id = m.mer_id');
if (isset($where['section_startTime']) && $where['section_startTime'] && isset($where['section_endTime']) && $where['section_endTime']) {
// $data->where('o.create_time', '>', $where['section_startTime'])->where('o.create_time', '<', $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,o.create_time,u.nickname');
$data->field('o.order_id,o.uid,o.mer_id,o.pay_price,m.mer_name,o.create_time');
$list = $data->order('o.create_time DESC')->page($page, $limit)->select();
$income = 0;
$outcome = 0;
foreach ($list as &$value){
if($value['mer_id'] == $merId){
$value['nickname'] = User::getDB()->where(['uid'=>$value['uid']])->value('nickname');
$value['msg'] = "收入";
$income +=$value['pay_price'];
$value['come_msg'] = "来自".$value['nickname'];
@ -2467,7 +2469,6 @@ class StoreOrderRepository extends BaseRepository
$value['come_msg'] = "给".$value['mer_name'];
}
}
return compact('income','outcome','list');
}