From c5e79115b8dd52601537336595d5d3711472ad43 Mon Sep 17 00:00:00 2001
From: Lemon <15040771@qq.com>
Date: Thu, 10 Sep 2020 10:19:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Controller/v3/OrderOnlineController.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/Controller/v3/OrderOnlineController.php b/app/Controller/v3/OrderOnlineController.php
index 554a029..ce37e77 100644
--- a/app/Controller/v3/OrderOnlineController.php
+++ b/app/Controller/v3/OrderOnlineController.php
@@ -93,15 +93,13 @@ class OrderOnlineController extends BaseController
         ])
             ->select('id')
             ->first();
-         $res['location'] = $this->userAddressService->getAddressAndDistributionRrice($address->id,$marketId);
+        $res['location'] = $this->userAddressService->getAddressAndDistributionRrice($address->id,$marketId);
         //返回预约送达时间 数组
         $res['appointment_time'] = $this->appointmentTimeService->do();
         //
         $res['store_list'] = $this->shopCartService->getGoodsByShopcartId($shopcartIds);
         //获取用户优惠券
         $res['coupon'] = $this->couponRecService->allForOnlineOrderAvailable($userId, $marketId);
-        //获取配送费
-        $res['distribution_price'] = '5.0';
         //增值服务接口
         $res['value_added_service'] = [
             'select' => 1,
@@ -110,10 +108,10 @@ class OrderOnlineController extends BaseController
         $total = 0;
         foreach ($res['store_list'] as $store)
         {
-            $total+= $store['subtotal'];
+            $total = bcadd($total,$store['subtotal'],2);
         }
-        $total+= $res['value_added_service']['price'];
-        $total+= $res['distribution_price'];
+        $total = bcadd($total,$res['value_added_service']['price'],2);
+        $total = bcadd($total,$res['location']['distribution_price'],2);
         $res['total'] = $total;
         return $this->success($res);
     }