From c86830a4913e996b47c635087a5f85665c07fb2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= Date: Thu, 11 Mar 2021 17:48:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/data/controller/ShopOrder.php | 10 ++++------ app/data/controller/ShopOrderSend.php | 2 +- app/data/controller/api/auth/Order.php | 2 +- app/data/service/OrderService.php | 8 +++----- app/data/service/UserService.php | 4 ++-- 5 files changed, 11 insertions(+), 15 deletions(-) diff --git a/app/data/controller/ShopOrder.php b/app/data/controller/ShopOrder.php index 21cfdcd5d..3f4c50cc6 100644 --- a/app/data/controller/ShopOrder.php +++ b/app/data/controller/ShopOrder.php @@ -66,7 +66,7 @@ class ShopOrder extends Controller if ($db->getOptions('where')) $query->whereRaw("uid in {$db->field('id')->buildSql()}"); // 推荐人搜索查询 $db = $this->_query('DataUser')->like('phone#from_phone,nickname#from_nickname')->db(); - if ($db->getOptions('where')) $query->whereRaw("from in {$db->field('id')->buildSql()}"); + if ($db->getOptions('where')) $query->whereRaw("puid1 in {$db->field('id')->buildSql()}"); // 列表选项卡 if (is_numeric($this->type = trim(input('type', 'ta'), 't'))) { $query->where(['status' => $this->type]); @@ -85,11 +85,9 @@ class ShopOrder extends Controller protected function _index_page_filter(array &$data) { UserService::instance()->buildByUid($data); - UserService::instance()->buildByUid($data, 'from', 'fromer'); - OrderService::instance()->buildItemData($data); - foreach ($data as &$vo) { - $vo['payment_name'] = PaymentService::name($vo['payment_type']); - } + UserService::instance()->buildByUid($data, 'puid1', 'fromer'); + OrderService::instance()->buildOrderData($data); + foreach ($data as &$vo) $vo['payment_name'] = PaymentService::name($vo['payment_type']); } /** diff --git a/app/data/controller/ShopOrderSend.php b/app/data/controller/ShopOrderSend.php index 21e89c050..a31503011 100644 --- a/app/data/controller/ShopOrderSend.php +++ b/app/data/controller/ShopOrderSend.php @@ -66,7 +66,7 @@ class ShopOrderSend extends Controller */ protected function _index_page_filter(array &$data) { - OrderService::instance()->buildItemData($data, false); + OrderService::instance()->buildOrderData($data, false); $orders = array_unique(array_column($data, 'order_no')); $orderList = $this->app->db->name('ShopOrder')->whereIn('order_no', $orders)->column('*', 'order_no'); foreach ($data as &$vo) $vo['order'] = $orderList[$vo['order_no']] ?? []; diff --git a/app/data/controller/api/auth/Order.php b/app/data/controller/api/auth/Order.php index 6a82ff23f..ee782c037 100644 --- a/app/data/controller/api/auth/Order.php +++ b/app/data/controller/api/auth/Order.php @@ -40,7 +40,7 @@ class Order extends Auth $map = ['uid' => $this->uuid, 'deleted' => 0]; $query = $this->_query('ShopOrder')->in('status')->equal('order_no'); $result = $query->where($map)->order('id desc')->page(true, false, false, 20); - if (count($result['list']) > 0) OrderService::instance()->buildItemData($result['list']); + if (count($result['list']) > 0) OrderService::instance()->buildOrderData($result['list']); $this->success('获取订单数据成功！', $result); } diff --git a/app/data/service/OrderService.php b/app/data/service/OrderService.php index ce03f7de4..74c78d329 100644 --- a/app/data/service/OrderService.php +++ b/app/data/service/OrderService.php @@ -45,7 +45,7 @@ class OrderService extends Service * @throws \think\db\exception\DbException * @throws \think\db\exception\ModelNotFoundException */ - public function buildItemData(array &$data = [], $fromer = true): array + public function buildOrderData(array &$data = [], $fromer = true): array { // 关联发货信息 $nobs = array_unique(array_column($data, 'order_no')); @@ -57,11 +57,9 @@ class OrderService extends Service // 关联用户数据 $fields = 'username,phone,nickname,headimg,status'; UserService::instance()->buildByUid($data, 'uid', 'user', $fields); - if ($fromer) UserService::instance()->buildByUid($data, 'from', 'fromer', $fields); + if ($fromer) UserService::instance()->buildByUid($data, 'puid1', 'fromer', $fields); foreach ($data as &$vo) { - $vo['sales'] = 0; - $vo['truck'] = $trucks[$vo['order_no']] ?? []; - $vo['items'] = []; + [$vo['sales'], $vo['truck'], $vo['items']] = [0, $trucks[$vo['order_no']] ?? [], []]; foreach ($items as $item) if ($vo['order_no'] === $item['order_no']) { $vo['sales'] += $item['stock_sales']; $vo['items'][] = $item; diff --git a/app/data/service/UserService.php b/app/data/service/UserService.php index 75b1becda..e2549a46c 100644 --- a/app/data/service/UserService.php +++ b/app/data/service/UserService.php @@ -256,8 +256,8 @@ class UserService extends Service $orderAmountTotal = $this->app->db->name('ShopOrder')->whereRaw("uid={$uid} and status in (3,4,5)")->sum('amount_goods'); // 统计团队业绩 $usql = $this->app->db->name('DataUser')->field('id')->whereRaw("`pid1`={$uid}")->buildSql(); - $teamsAmountDirect = $this->app->db->name('ShopOrder')->whereRaw("`from`={$uid} and status in (3,4,5)")->sum('amount_goods'); - $teamsAmountIndirect = $this->app->db->name('ShopOrder')->whereRaw("`from` in {$usql} and status in (3,4,5)")->sum('amount_goods'); + $teamsAmountDirect = $this->app->db->name('ShopOrder')->whereRaw("`puid1`={$uid} and status in (3,4,5)")->sum('amount_goods'); + $teamsAmountIndirect = $this->app->db->name('ShopOrder')->whereRaw("`puid1` in {$usql} and status in (3,4,5)")->sum('amount_goods'); // 更新用户数据 $data = [ 'vip_name' => $vipName,