From 8dc83a36111d0bdbe04b8a7a282811edb5fb7273 Mon Sep 17 00:00:00 2001
From: Junling Bu <linlinjavaer@gmail.com>
Date: Thu, 21 Nov 2019 23:40:39 +0800
Subject: [PATCH] =?UTF-8?q?feat[litemall-core,=20litemall-admin]:=20?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E9=85=8D=E7=BD=AE=E6=94=AF=E6=8C=81=E5=AE=9A?=
 =?UTF-8?q?=E7=90=86=E5=9D=90=E6=A0=87=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 litemall-admin/src/views/config/mall.vue            | 13 ++++++++++++-
 .../litemall/core/system/SystemConfig.java          | 10 ++++++++++
 .../litemall/core/system/SystemInistService.java    |  6 ++++--
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/litemall-admin/src/views/config/mall.vue b/litemall-admin/src/views/config/mall.vue
index d14abd6a..a7ac934b 100644
--- a/litemall-admin/src/views/config/mall.vue
+++ b/litemall-admin/src/views/config/mall.vue
@@ -7,6 +7,15 @@
       <el-form-item label="商场地址" prop="litemall_mall_address">
         <el-input v-model="dataForm.litemall_mall_address"/>
       </el-form-item>
+      <el-form-item label="地理坐标">
+        <el-col :span="11">
+          <el-input v-model="dataForm.litemall_mall_longitude" placeholder="经度"/>
+        </el-col>
+        <el-col :span="2" style="text-align: center;">-</el-col>
+        <el-col :span="11">
+          <el-input v-model="dataForm.litemall_mall_latitude" placeholder="纬度"/>
+        </el-col>
+      </el-form-item>
       <el-form-item label="联系电话" prop="litemall_mall_phone">
         <el-input v-model="dataForm.litemall_mall_phone"/>
       </el-form-item>
@@ -32,7 +41,9 @@ export default {
         litemall_mall_name: '',
         litemall_mall_address: '',
         litemall_mall_phone: '',
-        litemall_mall_qq: ''
+        litemall_mall_qq: '',
+        litemall_mall_longitude: '',
+        litemall_mall_latitude: ''
       },
       rules: {
         litemall_mall_name: [
diff --git a/litemall-core/src/main/java/org/linlinjava/litemall/core/system/SystemConfig.java b/litemall-core/src/main/java/org/linlinjava/litemall/core/system/SystemConfig.java
index 6f96ff3f..3e1fc0d0 100644
--- a/litemall-core/src/main/java/org/linlinjava/litemall/core/system/SystemConfig.java
+++ b/litemall-core/src/main/java/org/linlinjava/litemall/core/system/SystemConfig.java
@@ -28,6 +28,8 @@ public class SystemConfig {
     public final static String LITEMALL_MALL_ADDRESS = "litemall_mall_address";
     public final static String LITEMALL_MALL_PHONE = "litemall_mall_phone";
     public final static String LITEMALL_MALL_QQ = "litemall_mall_qq";
+    public final static String LITEMALL_MALL_LONGITUDE = "litemall_mall_longitude";
+    public final static String LITEMALL_MALL_Latitude = "litemall_mall_latitude";
 
     //所有的配置均保存在该 HashMap 中
     private static Map<String, String> SYSTEM_CONFIGS = new HashMap<>();
@@ -112,6 +114,14 @@ public class SystemConfig {
         return getConfig(LITEMALL_MALL_QQ);
     }
 
+    public static String getMallLongitude() {
+        return getConfig(LITEMALL_MALL_LONGITUDE);
+    }
+
+    public static String getMallLatitude() {
+        return getConfig(LITEMALL_MALL_Latitude);
+    }
+
     public static void setConfigs(Map<String, String> configs) {
         SYSTEM_CONFIGS = configs;
     }
diff --git a/litemall-core/src/main/java/org/linlinjava/litemall/core/system/SystemInistService.java b/litemall-core/src/main/java/org/linlinjava/litemall/core/system/SystemInistService.java
index 9796a52c..37accbef 100644
--- a/litemall-core/src/main/java/org/linlinjava/litemall/core/system/SystemInistService.java
+++ b/litemall-core/src/main/java/org/linlinjava/litemall/core/system/SystemInistService.java
@@ -48,11 +48,13 @@ class SystemInistService {
         DEFAULT_CONFIGS.put(SystemConfig.LITEMALL_ORDER_UNPAID, "30");
         DEFAULT_CONFIGS.put(SystemConfig.LITEMALL_ORDER_UNCONFIRM, "7");
         DEFAULT_CONFIGS.put(SystemConfig.LITEMALL_ORDER_COMMENT, "7");
-        // 订单相关配置默认值
+        // 商城相关配置默认值
         DEFAULT_CONFIGS.put(SystemConfig.LITEMALL_MALL_NAME, "litemall");
         DEFAULT_CONFIGS.put(SystemConfig.LITEMALL_MALL_ADDRESS, "上海");
+        DEFAULT_CONFIGS.put(SystemConfig.LITEMALL_MALL_Latitude, "31.201900");
+        DEFAULT_CONFIGS.put(SystemConfig.LITEMALL_MALL_LONGITUDE, "121.587839");
         DEFAULT_CONFIGS.put(SystemConfig.LITEMALL_MALL_PHONE, "021-xxxx-xxxx");
-        DEFAULT_CONFIGS.put(SystemConfig.LITEMALL_MALL_QQ, "738696120");
+        DEFAULT_CONFIGS.put(SystemConfig.LITEMALL_MALL_QQ, "705144434");
     }
 
     @Autowired