diff --git a/crmeb/app/dao/activity/bargain/StoreBargainUserDao.php b/crmeb/app/dao/activity/bargain/StoreBargainUserDao.php index de82d3d7c..78ddda87f 100644 --- a/crmeb/app/dao/activity/bargain/StoreBargainUserDao.php +++ b/crmeb/app/dao/activity/bargain/StoreBargainUserDao.php @@ -104,8 +104,11 @@ class StoreBargainUserDao extends BaseDao */ public function bargainUserList($where, $page = 0, $limit = 0) { - return $this->search($where)->with(['getBargain', 'getUser'])->when($page != 0, function ($query) use ($page, $limit) { - $query->page($page, $limit); - })->order('add_time desc')->select()->toArray(); + 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'] . '%'); + })->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 a32c3f941..6dd4614f3 100644 --- a/crmeb/app/dao/order/StoreOrderDao.php +++ b/crmeb/app/dao/order/StoreOrderDao.php @@ -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(['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'])->select()->toArray(); } /** @@ -967,7 +967,7 @@ class StoreOrderDao extends BaseDao */ public function combinationStatisticsOrder($id, $where, $page = 0, $limit = 0) { - return $this->search($where)->where('combination_id', $id)->where('paid', 1)->whereIn('refund_type', [0, 3])->where('is_del', 0) + return $this->search($where)->where('combination_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'])->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 38858a92a..8e62edf35 100644 --- a/crmeb/app/services/activity/bargain/StoreBargainServices.php +++ b/crmeb/app/services/activity/bargain/StoreBargainServices.php @@ -1027,6 +1027,7 @@ class StoreBargainServices extends BaseServices /** @var StoreOrderServices $orderServices */ $orderServices = app()->make(StoreOrderServices::class); [$page, $limit] = $this->getPageValue(); + $where = $where + ['paid' => 1, 'refund_status' => 0, 'is_del' => 0]; $list = $orderServices->bargainStatisticsOrder($id, $where, $page, $limit); $where['bargain_id'] = $id; $count = $orderServices->count($where); diff --git a/crmeb/app/services/activity/bargain/StoreBargainUserServices.php b/crmeb/app/services/activity/bargain/StoreBargainUserServices.php index 6c196f3f4..570e6167a 100644 --- a/crmeb/app/services/activity/bargain/StoreBargainUserServices.php +++ b/crmeb/app/services/activity/bargain/StoreBargainUserServices.php @@ -234,6 +234,9 @@ class StoreBargainUserServices extends BaseServices * 砍价列表 * @param $where * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException */ public function bargainUserList($where) { diff --git a/crmeb/app/services/activity/combination/StoreCombinationServices.php b/crmeb/app/services/activity/combination/StoreCombinationServices.php index a894d7789..da8d85a86 100644 --- a/crmeb/app/services/activity/combination/StoreCombinationServices.php +++ b/crmeb/app/services/activity/combination/StoreCombinationServices.php @@ -659,6 +659,7 @@ class StoreCombinationServices extends BaseServices /** @var StoreOrderServices $orderServices */ $orderServices = app()->make(StoreOrderServices::class); [$page, $limit] = $this->getPageValue(); + $where = $where + ['paid' => 1, 'refund_status' => 0, 'is_del' => 0]; $list = $orderServices->combinationStatisticsOrder($id, $where, $page, $limit); $where['combination_id'] = $id; $count = $orderServices->count($where); diff --git a/crmeb/app/services/activity/seckill/StoreSeckillServices.php b/crmeb/app/services/activity/seckill/StoreSeckillServices.php index 1bcf9c782..b47a78054 100644 --- a/crmeb/app/services/activity/seckill/StoreSeckillServices.php +++ b/crmeb/app/services/activity/seckill/StoreSeckillServices.php @@ -775,7 +775,7 @@ class StoreSeckillServices extends BaseServices /** @var StoreOrderServices $orderServices */ $orderServices = app()->make(StoreOrderServices::class); [$page, $limit] = $this->getPageValue(); - $where['is_del'] = 0; + $where = $where + ['paid' => 1, 'refund_status' => 0, 'is_del' => 0]; $list = $orderServices->seckillOrder($id, $where, $page, $limit); $where['seckill_id'] = $id; $count = $orderServices->count($where); diff --git a/template/admin/src/pages/marketing/storeBargain/statistics.vue b/template/admin/src/pages/marketing/storeBargain/statistics.vue index ff55f1843..2436b9c38 100644 --- a/template/admin/src/pages/marketing/storeBargain/statistics.vue +++ b/template/admin/src/pages/marketing/storeBargain/statistics.vue @@ -42,7 +42,7 @@ search enter-button v-model="pagination.real_name" - placeholder="请输入用户姓名|手机号|UID" + :placeholder="type == 1 ? '请输入用户姓名|订单号|UID' : '请输入用户UID'" @on-search="searchList" />