theluyuan/litemall
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat[litemall-core, litemall-admin]: 商品配置支持定理坐标设置

Browse Source
This commit is contained in:
Junling Bu
2019-11-21 23:40:39 +08:00
parent e7d85dabef
commit 8dc83a3611
3 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
litemall-admin/src/views/config/mall.vue
View File

@@ -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: [

10
litemall-core/src/main/java/org/linlinjava/litemall/core/system/SystemConfig.java
View File

@@ -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;
}

6
litemall-core/src/main/java/org/linlinjava/litemall/core/system/SystemInistService.java
View File

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