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 @@ + + + + + - + + + + @@ -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 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 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