github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2026-10-30 14:31:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

秒杀导出，统计修复

Browse Source
This commit is contained in:
evoxwht 2023-03-28 18:13:28 +08:00
parent 1b6ce633ec
commit 129f026638
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crmeb/app/dao/order/StoreOrderDao.php
View File

@ -894,7 +894,7 @@ class StoreOrderDao extends BaseDao
*/
public function seckillPeople($id, $keyword, $page = 0, $limit = 0)
{
return $this->getModel()->where('paid', 1)->whereIn('refund_type', [0, 3])
return $this->getModel()->where('paid', 1)->whereIn('refund_type', [0, 3])->where('is_del', 0)
->when($id != 0, function ($query) use ($id) {
$query->where('seckill_id', $id);
})->when($keyword != '', function ($query) use ($keyword) {

1
crmeb/app/services/activity/seckill/StoreSeckillServices.php
View File

@ -768,6 +768,7 @@ class StoreSeckillServices extends BaseServices
/** @var StoreOrderServices $orderServices */
$orderServices = app()->make(StoreOrderServices::class);
[$page, $limit] = $this->getPageValue();
$where['is_del'] = 0;
$list = $orderServices->seckillOrder($id, $where, $page, $limit);
$where['seckill_id'] = $id;
$count = $orderServices->count($where);

2
crmeb/app/services/other/export/ExportServices.php
View File

@ -306,7 +306,7 @@ class ExportServices extends BaseServices
'ot_price' => $item['ot_price'],
'quota' => $item['quota'],
'start_name' => $item['start_name'],
'activity_time' => date('Y-m-d H:i:s', $item['start_time']) . '至' . date('Y-m-d H:i:s', $item['stop_time']),
'activity_time' => date('Y-m-d', $item['start_time']) . '至' . date('Y-m-d', $item['stop_time']),
'add_time' => $item['add_time']
];
$export[] = $one_data;