自定义域字段-新增服务

gic-store-web/src/main/java/com/gic/store/web/controller/StoreFieldController.java

@@ -172,7 +172,7 @@ public class StoreFieldController {
     public RestResponse listStoreField(String search, PageQO pageQO) {
         ServiceResponse<Page<StoreFieldDTO>> result = storeFieldApiService.listStoreField(StoreGroupConstant.TEST_ENTERPRISE_ID, search, pageQO.getCurrentPage(), pageQO.getPageSize());
         if (result.isSuccess()) {
-            ServiceResponse<List<StoreRegionDTO>> serviceResponse = storeRegionApiService.listStoreRegion(StoreGroupConstant.TEST_ENTERPRISE_ID, search);
+            ServiceResponse<List<StoreRegionDTO>> serviceResponse = storeRegionApiService.listStoreRegion(StoreGroupConstant.TEST_ENTERPRISE_ID, null);
             List<StoreRegionDTO> regionDTOList = serviceResponse.getResult();
             Map<Integer, String> regionMap = new HashMap<>(16);
             for (StoreRegionDTO regionDTO : regionDTOList) {
@@ -276,9 +276,12 @@ public class StoreFieldController {
         String[] regionIdArr = regionId.split("_");
         StringBuilder result = new StringBuilder();
         for (String str : regionIdArr) {
-            result.append(regionMap.get(str));
+            if (StringUtils.isBlank(str)) {
+                continue;
+            }
+            result.append(regionMap.get(Integer.parseInt(str)));
             result.append("/");
         }
-        return result.toString();
+        return result.toString().substring(0, result.toString().length() - 1);
     }
 }

gic-store-web/src/main/java/com/gic/store/web/vo/storefield/StoreFieldVO.java

@@ -51,6 +51,15 @@ public class StoreFieldVO implements Serializable{
      * 排序值
      */
     private Integer seq;
+    /**
+     * 是否是映射 1：是
+     */
+    private Integer isErpMapping;
+
+    /**
+     * 是否是筛选/列表支持 1：是
+     */
+    private Integer isFilter;
 
     public Integer getStoreFieldId() {
         return storeFieldId;
@@ -123,4 +132,20 @@ public class StoreFieldVO implements Serializable{
     public void setStoreRegionId(String storeRegionId) {
         this.storeRegionId = storeRegionId;
     }
+
+    public Integer getIsErpMapping() {
+        return isErpMapping;
+    }
+
+    public void setIsErpMapping(Integer isErpMapping) {
+        this.isErpMapping = isErpMapping;
+    }
+
+    public Integer getIsFilter() {
+        return isFilter;
+    }
+
+    public void setIsFilter(Integer isFilter) {
+        this.isFilter = isFilter;
+    }
 }