From 0cb434ecebc6981761f77452fb7b40f9a05abfe4 Mon Sep 17 00:00:00 2001 From: luofei <604446095@qq.com> Date: Mon, 10 Jul 2023 09:50:22 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=AF=95=E4=BF=A1=E7=94=A8=E8=B4=AD?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=BB=93=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/ExceptionHandle.php | 2 +- .../store/order/StoreGroupOrderRepository.php | 18 +++++++++++++----- app/controller/api/store/order/StoreOrder.php | 2 +- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/app/ExceptionHandle.php b/app/ExceptionHandle.php index bdd23a35..eceb6c7c 100644 --- a/app/ExceptionHandle.php +++ b/app/ExceptionHandle.php @@ -66,6 +66,7 @@ class ExceptionHandle extends Handle { // 添加自定义异常处理机制 $this->report($e); + DingTalk::exception($e, $e->getMessage(), $request); // 其他错误交给系统处理 if ($e instanceof ValidateException) return app('json')->fail($e->getMessage()); @@ -82,7 +83,6 @@ class ExceptionHandle extends Handle else if ($e instanceof \EasyWeChat\Core\Exceptions\HttpException) return app('json')->fail($e->getMessage()); - DingTalk::exception($e, $request); return parent::render($request, $e); } } diff --git a/app/common/repositories/store/order/StoreGroupOrderRepository.php b/app/common/repositories/store/order/StoreGroupOrderRepository.php index 3a19de60..acf2f034 100644 --- a/app/common/repositories/store/order/StoreGroupOrderRepository.php +++ b/app/common/repositories/store/order/StoreGroupOrderRepository.php @@ -68,13 +68,18 @@ class StoreGroupOrderRepository extends BaseRepository $query->field('mer_id,mer_name,settle_cycle,interest_rate'); }, 'orderProduct','presellOrder']); }, 'interest'])->page($page, $limit)->order('create_time DESC')->select(); + $return = []; foreach ($list as $k => $item) { + $current = $item->toArray(); if (!empty($item->interest)) { $interest = $item->interest->calculateInterest(); - $list[$k]['interest']['total_amount'] = bcadd($item->interest->total_price, $interest, 2); + $current['interest']['total_amount'] = bcadd($item->interest->total_price, $interest, 2); + } else { + $current['interest']['total_amount'] = $item['total_price']; } + $return[] = $current; } - return compact('count', 'list'); + return compact('count', 'return'); } /** @@ -100,12 +105,15 @@ class StoreGroupOrderRepository extends BaseRepository $flag && $query->field('mer_id,mer_name,settle_cycle,interest_rate'); }, 'orderProduct', 'presellOrder']); }, 'interest']) - ->order('create_time DESC')->find(); + ->order('create_time DESC')->append(['cancel_time', 'cancel_unix'])->find(); + $return = $order->toArray(); if (!empty($order->interest)) { $interest = $order->interest->calculateInterest(); - $order['interest']['total_amount'] = bcadd($order->interest->total_price, $interest, 2); + $return['interest']['total_amount'] = bcadd($order->interest->total_price, $interest, 2); + } else { + $return['interest']['total_amount'] = $order['total_price']; } - return $order; + return $return; } public function status($uid, $id) diff --git a/app/controller/api/store/order/StoreOrder.php b/app/controller/api/store/order/StoreOrder.php index 506c814c..37c46565 100644 --- a/app/controller/api/store/order/StoreOrder.php +++ b/app/controller/api/store/order/StoreOrder.php @@ -196,7 +196,7 @@ class StoreOrder extends BaseController if (!$groupOrder) return app('json')->fail('订单不存在'); else - return app('json')->success($groupOrder->append(['cancel_time', 'cancel_unix'])->toArray()); + return app('json')->success($groupOrder); } public function groupOrderStatus($id, StoreGroupOrderRepository $groupOrderRepository)