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-04-01 10:39:41 +08:00
parent c17274dc89
commit 9d363bd7d3
5 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crmeb/app/dao/activity/bargain/StoreBargainUserDao.php
View File

@ -106,7 +106,7 @@ class StoreBargainUserDao extends BaseDao
{
return $this->search($where)->with(['getBargain', 'getUser'])
->when(isset($where['real_name']) && $where['real_name'] != '', function ($query) use ($where) {
$query->where('uid|nickname', 'like', '%' . $where['keyword'] . '%');
$query->where('uid', $where['real_name']);
})->when($page != 0, function ($query) use ($page, $limit) {
$query->page($page, $limit);
})->order('add_time desc')->select()->toArray();

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

@ -932,7 +932,7 @@ class StoreOrderDao extends BaseDao
return $this->search($where)->where('seckill_id', $id)
->when($page && $limit, function ($query) use ($page, $limit) {
$query->page($page, $limit);
})->field(['order_id', 'real_name', 'status', 'pay_price', 'total_num', 'add_time', 'pay_time', 'paid'])->select()->toArray();
})->field(['order_id', 'real_name', 'status', 'pay_price', 'total_num', 'add_time', 'pay_time', 'paid'])->order('add_time desc')->select()->toArray();
}
/**
@ -951,7 +951,7 @@ class StoreOrderDao extends BaseDao
return $this->search($where)->where('bargain_id', $id)
->when($page && $limit, function ($query) use ($page, $limit) {
$query->page($page, $limit);
})->field(['uid', 'order_id', 'real_name', 'status', 'pay_price', 'total_num', 'add_time', 'pay_time', 'paid'])->select()->toArray();
})->field(['uid', 'order_id', 'real_name', 'status', 'pay_price', 'total_num', 'add_time', 'pay_time', 'paid'])->order('add_time desc')->select()->toArray();
}
/**

4
crmeb/app/services/activity/bargain/StoreBargainServices.php
View File

@ -996,8 +996,8 @@ class StoreBargainServices extends BaseServices
$spread_count = $bargainUserHelp->count(['bargain_id' => $id, 'type' => 0]);
$start_count = $bargainUser->count(['bargain_id' => $id]);
$success_count = $bargainUser->count(['bargain_id' => $id, 'status' => 3]);
$pay_price = $orderServices->sum(['bargain_id' => $id, 'paid' => 1], 'pay_price', true);
$pay_count = $orderServices->count(['bargain_id' => $id, 'paid' => 1]);
$pay_price = $orderServices->sum([['bargain_id', '=', $id], ['paid', '=', 1], ['refund_type', 'in', [0, 3]], ['is_del', '=', 0]], 'pay_price', false);
$pay_count = $orderServices->getDistinctCount([['bargain_id', '=', $id], ['paid', '=', 1], ['refund_type', 'in', [0, 3]], ['is_del', '=', 0]], 'uid', false);
$pay_rate = $start_count > 0 ? bcmul(bcdiv((string)$pay_count, (string)$start_count, 2), '100', 2) : 0;
return compact('people_count', 'spread_count', 'start_count', 'success_count', 'pay_price', 'pay_count', 'pay_rate');
}

3
template/admin/src/pages/marketing/storeBargain/statistics.vue
View File

@ -26,8 +26,7 @@
<Row type="flex" :gutter="24">
<Col span="6" v-if="type == 1">
<FormItem label="订单状态：" label-for="status">
<Select v-model="pagination.status" placeholder="请选择订单状态">
<Option value="">全部</Option>
<Select v-model="pagination.status" placeholder="请选择订单状态" clearable @on-change="searchList">
<Option value="0">未支付</Option>
<Option value="1">待发货</Option>
<Option value="2">待收货</Option>

3
template/admin/src/pages/marketing/storeCombination/statistics.vue
View File

@ -26,8 +26,7 @@
<Row type="flex" :gutter="24">
<Col span="6" v-if="type == 1">
<FormItem label="订单状态：" label-for="status">
<Select v-model="pagination.status" placeholder="请选择订单状态">
<Option value="">全部</Option>
<Select v-model="pagination.status" placeholder="请选择订单状态" clearable @on-change="searchList">
<Option value="0">未支付</Option>
<Option value="1">待发货</Option>
<Option value="2">待收货</Option>