From 497de707add0f56ae9eec386806e981839cebb13 Mon Sep 17 00:00:00 2001
From: liapples <liapples@163.com>
Date: Mon, 25 Oct 2021 23:49:37 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Api/OrderController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Api/OrderController.php b/app/Http/Controllers/Api/OrderController.php
index c7293b6..11b8ce7 100644
--- a/app/Http/Controllers/Api/OrderController.php
+++ b/app/Http/Controllers/Api/OrderController.php
@@ -186,8 +186,8 @@ class OrderController extends Controller
 			$order_price = 0; //订单总价
 			$costPrice = 0; //供应商成本总价
 			foreach ($spec as $v) {
-				$order_price = bcadd($order_price, bcmul($v['price'], $formData['num'], 6), 6);
-				$costPrice = bcadd($costPrice, bcmul($v['cost_price'], $formData['num'], 6), 6);
+				$order_price = bcadd($order_price, bcmul($v['price'], $formData['num'], 6), 6); //订单总价
+				$costPrice = bcadd($costPrice, bcmul($v['cost_price'], $formData['num'], 6), 6); //供应商成本总价
 			}
 			$order_price = round($order_price, 2);
 

From e99c7835a73ec6210d5f156d39ddb71a39d5f64e Mon Sep 17 00:00:00 2001
From: liapples <liapples@163.com>
Date: Tue, 26 Oct 2021 00:20:20 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9C=B0=E5=9B=BE?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/admin-agent.php | 8 ++++++++
 config/admin.php       | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/config/admin-agent.php b/config/admin-agent.php
index 9e3aa99..4e75ba4 100644
--- a/config/admin-agent.php
+++ b/config/admin-agent.php
@@ -343,4 +343,12 @@ return [
     | Whether enable default breadcrumb for every page content.
     */
     'enable_default_breadcrumb' => true,
+
+	//地图配置
+	'map_provider' => 'tencent',
+	'map' => [
+		'keys' => [
+			'tencent' => env('TENCENT_MAP_KEY','')
+		]
+	]
 ];
diff --git a/config/admin.php b/config/admin.php
index e699c57..f5b8abb 100644
--- a/config/admin.php
+++ b/config/admin.php
@@ -363,4 +363,12 @@ return [
         // the extension files will be generated in this directory.
         'dir' => base_path('dcat-admin-extensions'),
     ],
+
+	//地图配置
+	'map_provider' => 'tencent',
+	'map' => [
+		'keys' => [
+			'tencent' => env('TENCENT_MAP_KEY','')
+		]
+	]
 ];