diff --git a/crmeb/app/dao/activity/bargain/StoreBargainUserDao.php b/crmeb/app/dao/activity/bargain/StoreBargainUserDao.php index 78ddda87f..31f48bf64 100644 --- a/crmeb/app/dao/activity/bargain/StoreBargainUserDao.php +++ b/crmeb/app/dao/activity/bargain/StoreBargainUserDao.php @@ -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(); diff --git a/crmeb/app/dao/order/StoreOrderDao.php b/crmeb/app/dao/order/StoreOrderDao.php index 6dd4614f3..0dec3588b 100644 --- a/crmeb/app/dao/order/StoreOrderDao.php +++ b/crmeb/app/dao/order/StoreOrderDao.php @@ -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(); } /** diff --git a/crmeb/app/services/activity/bargain/StoreBargainServices.php b/crmeb/app/services/activity/bargain/StoreBargainServices.php index 8e62edf35..bf18fcf9e 100644 --- a/crmeb/app/services/activity/bargain/StoreBargainServices.php +++ b/crmeb/app/services/activity/bargain/StoreBargainServices.php @@ -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'); } diff --git a/template/admin/src/pages/marketing/storeBargain/statistics.vue b/template/admin/src/pages/marketing/storeBargain/statistics.vue index 2436b9c38..b7d6d54ac 100644 --- a/template/admin/src/pages/marketing/storeBargain/statistics.vue +++ b/template/admin/src/pages/marketing/storeBargain/statistics.vue @@ -26,8 +26,7 @@ - diff --git a/template/admin/src/pages/marketing/storeCombination/statistics.vue b/template/admin/src/pages/marketing/storeCombination/statistics.vue index a3567354e..0d70db925 100644 --- a/template/admin/src/pages/marketing/storeCombination/statistics.vue +++ b/template/admin/src/pages/marketing/storeCombination/statistics.vue @@ -26,8 +26,7 @@ -