From 60221e78e4c156fdff1d082a01eb3866de5a6ccf Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Sat, 9 Mar 2024 16:33:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=82=80=E8=AF=B7=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=20=E9=87=87=E8=B4=AD=E9=87=91=E9=A2=9D=E5=92=8C?=
 =?UTF-8?q?=E9=94=80=E5=94=AE=E9=87=91=E9=A2=9D=E7=9A=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/user/User.php | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/app/controller/api/user/User.php b/app/controller/api/user/User.php
index 7bc26e61..83ecab35 100755
--- a/app/controller/api/user/User.php
+++ b/app/controller/api/user/User.php
@@ -566,23 +566,13 @@ class User extends BaseController
         $userIds = UserModel::where('spread_uid', $this->user->uid)->page($page, $limit)->column('uid');
         $query = Merchant::whereIn('uid', $userIds)->where('is_del', 0);
         $merchants = $query->page($page, $limit)
-            ->field('mer_id,mer_name,uid,real_name')
+            ->field('mer_id,mer_name,uid,real_name,sale_amount,purchase_amount as buy_amount')
             ->select()->toArray();
-        $dao = new StoreOrderDao();
-        /** @var PresellOrderRepository $preSellDao */
-        $preSellRepo = app()->make(PresellOrderRepository::class);
         $merchants = reset_index($merchants, 'uid');
         $result = [];
         foreach ($userIds as $userId) {
             if (isset($merchants[$userId])) {
                 $merchant = $merchants[$userId];
-                $saleOrderQuery = $dao->search(['mer_id' => $merchant['mer_id']])->whereIn('StoreOrder.status', [0, 1, 2, 3, 9, 10])->where('paid', 1);
-                $saleOrderIds = $saleOrderQuery->column('order_id');
-                $saleAmount1 = $saleOrderQuery->sum('StoreOrder.pay_price');
-                $saleAmount2 = $preSellRepo->search(['paid' => 1, 'order_ids' => $saleOrderIds])->sum('pay_price');
-                $merchant['sale_amount'] = bcadd($saleAmount1, $saleAmount2, 2);
-                $merchant['buy_amount'] = StoreOrderOther::where('uid', $merchant['uid'])->whereIn('status', [0, 1, 2, 3, 9, 10])->where('paid', 1)->sum('pay_price');
-                $merchant['buy_amount'] = bcadd($merchant['buy_amount'], 0, 2);
                 $merchant['status'] = 1;
                 $result[] = $merchant;
             } else {