修改门店逻辑

kmall-admin/src/main/java/com/kmall/admin/controller/StoreController.java

@@ -98,6 +98,26 @@ public class StoreController {
     @RequiresPermissions("store:update")
     @ResponseBody
     public R update(@RequestBody StoreEntity store) {
+        SysUserEntity user = ShiroUtils.getUserEntity();
+        if(user == null) {
+            return R.error("用户登录超时，请重新登录");
+        }
+        if (user.getRoleType().equalsIgnoreCase("2")) {
+            return R.error("当前用户角色为【店员】，店员不能新增其他门店信息");
+        }
+        Map<String, Object> valideDate = MapBeanUtil.fromObject(store);
+        ImmutableBiMap.Builder builder = new ImmutableBiMap.Builder();
+        builder.put("merchSn", "商户");
+        builder.put("storeName", "门店名称");
+        builder.put("storeNumber", "门店编号");
+        builder.put("thirdPartyMerchCode", "第三方商户编号");
+        builder.put("thirdPartyMerchName", "第三方商户名称");
+        builder.put("latitude", "纬度");
+        builder.put("longitude", "经度");
+        R r = ValidatorUtil.isEmpty(builder.build(), valideDate);
+        if (Integer.valueOf(r.get("code").toString()) != 0) {
+            throw new RRException(r.get("msg").toString());
+        }
         storeService.update(store);
 
         return R.ok();

kmall-admin/src/main/webapp/js/shop/store.js

@@ -63,12 +63,6 @@ let vm = new Vue({
             thirdPartyMerchName: [
                 {required: true, message: '第三方商户名称不能为空', trigger: 'blur'}
             ],
-            latitude: [
-                {required: true, message: '纬度不能为空', trigger: 'blur'}
-            ],
-            longitude: [
-                {required: true, message: '经度不能为空', trigger: 'blur'}
-            ],
         },
         q: {
             storeName: '',