From 9b066cdfb3dd9a59ac8a1107273877cf3258b8ff Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Mon, 11 Mar 2024 10:55:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E6=88=B7=E7=AB=AF?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=AE=9E=E4=BB=98=E9=87=91=E9=A2=9D=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/server/StoreOrder.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/controller/api/server/StoreOrder.php b/app/controller/api/server/StoreOrder.php
index 7feaef9f..212dedd6 100755
--- a/app/controller/api/server/StoreOrder.php
+++ b/app/controller/api/server/StoreOrder.php
@@ -80,7 +80,11 @@ class StoreOrder extends BaseController
         $where['order_search'] = $this->request->param('search_info');
         $where['mer_id'] = $merId;
         $where['is_del'] = 0;
-        return app('json')->success($repository->merchantGetList($where, $page, $limit));
+        $result = $repository->merchantGetList($where, $page, $limit);
+        foreach ($result['list'] as &$item) {
+            $item['pay_price'] = $item['consumption_money'] > 0 ? bcadd($item['pay_price'], $item['consumption_money'], 2) : $item['pay_price'];
+        }
+        return app('json')->success($result);
     }
 
     public function order($merId, $id, StoreOrderRepository $repository)