省市区

gic-store-api/src/main/java/com/gic/store/service/ProvincesApiService.java

@@ -13,4 +13,10 @@ public interface ProvincesApiService {
     ServiceResponse<List<CityDTO>> selectAllCity();
 
     ServiceResponse<List<CountyDTO>> selectAllCounty();
+
+    ServiceResponse<List<ProvinceDTO>> queryProvinces(String search);
+
+    ServiceResponse<List<CityDTO>> queryCity(String search);
+
+    ServiceResponse<List<CountyDTO>> queryCounty(String search);
 }

gic-store-api/src/main/java/com/gic/store/service/StoreDictApiService.java

@@ -49,4 +49,19 @@ public interface StoreDictApiService {
      * @return
      */
     ServiceResponse saveStoreStatus(Integer enterpriseId, String[] storeStatusArr);
-}
+
+    /**
+     * 查询支持列表查询的自定义字段
+     * @param enterpriseId
+     * @return
+     */
+    ServiceResponse<List<StoreDictDTO>> listStoreField(Integer enterpriseId);
+
+    /**
+     * 保存自定义字段关联查询
+     * @param enterpriseId
+     * @param value
+     * @return
+     */
+    ServiceResponse saveStoreField(Integer enterpriseId, String value);
+}
\ No newline at end of file

gic-store-service/src/main/java/com/gic/store/dao/mapper/TabCityMapper.java

 package com.gic.store.dao.mapper;
 
 import com.gic.store.entity.TabCity;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -58,4 +59,6 @@ public interface TabCityMapper {
      * @return
      */
     List<TabCity> selectAllCity();
+
+    List<TabCity> queryCity(@Param("search")String search);
 }
\ No newline at end of file

gic-store-service/src/main/java/com/gic/store/dao/mapper/TabCountyMapper.java

 package com.gic.store.dao.mapper;
 
+import com.gic.store.entity.TabCity;
 import com.gic.store.entity.TabCounty;
+import com.gic.store.entity.TabProvince;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -54,4 +57,6 @@ public interface TabCountyMapper {
     int updateByPrimaryKey(TabCounty record);
 
     List<TabCounty> selectAllCounty();
+
+    List<TabCounty> queryCounty(@Param("search")String search);
 }
\ No newline at end of file

gic-store-service/src/main/java/com/gic/store/dao/mapper/TabProvinceMapper.java

 package com.gic.store.dao.mapper;
 
 import com.gic.store.entity.TabProvince;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -54,4 +55,6 @@ public interface TabProvinceMapper {
     int updateByPrimaryKey(TabProvince record);
 
     List<TabProvince> selectAllProvince();
+
+    List<TabProvince> queryProvinces(@Param("search") String search);
 }
\ No newline at end of file

gic-store-service/src/main/java/com/gic/store/dao/mapper/TabStoreDictMapper.java

@@ -61,4 +61,6 @@ public interface TabStoreDictMapper {
     List<String> listStoreType(Integer enterpriseId);
 
     List<String> listStoreStatus(Integer enterpriseId);
+
+    List<String> listStoreField(Integer enterpriseId);
 }
\ No newline at end of file

gic-store-service/src/main/java/com/gic/store/service/ProvincesService.java

@@ -12,4 +12,10 @@ public interface ProvincesService {
     List<TabCity> selectAllCity();
 
     List<TabCounty> selectAllCounty();
+
+    List<TabProvince> queryProvinces(String search);
+
+    List<TabCity> queryCity(String search);
+
+    List<TabCounty> queryCounty(String search);
 }

gic-store-service/src/main/java/com/gic/store/service/StoreDictService.java

@@ -30,4 +30,11 @@ public interface StoreDictService {
      * @param tabStoreDict
      */
     void saveStoreStatus(TabStoreDict  tabStoreDict);
+
+    /**
+     * 查询门店自定义字段配置支持查询
+     * @param enterpriseId
+     * @return
+     */
+    List<String> listStoreField(Integer enterpriseId);
 }

gic-store-service/src/main/java/com/gic/store/service/impl/ProvincesServiceImpl.java

@@ -35,4 +35,19 @@ public class ProvincesServiceImpl implements ProvincesService {
     public List<TabCounty> selectAllCounty() {
         return this.tabCountyMapper.selectAllCounty();
     }
+
+    @Override
+    public List<TabProvince> queryProvinces(String search) {
+        return this.tabProvinceMapper.queryProvinces(search);
+    }
+
+    @Override
+    public List<TabCity> queryCity(String search) {
+        return this.tabCityMapper.queryCity(search);
+    }
+
+    @Override
+    public List<TabCounty> queryCounty(String search) {
+        return this.tabCountyMapper.queryCounty(search);
+    }
 }

gic-store-service/src/main/java/com/gic/store/service/impl/StoreDictServiceImpl.java

@@ -33,4 +33,9 @@ public class StoreDictServiceImpl implements StoreDictService {
         tabStoreDict.setType("storeStatus");
         this.tabStoreDictMapper.insert(tabStoreDict);
     }
+
+    @Override
+    public List<String> listStoreField(Integer enterpriseId) {
+        return this.tabStoreDictMapper.listStoreField(enterpriseId);
+    }
 }

gic-store-service/src/main/java/com/gic/store/service/outer/ProvincesApiServiceImpl.java

@@ -51,4 +51,19 @@ public class ProvincesApiServiceImpl implements ProvincesApiService {
         }
         return ServiceResponse.success(list);
     }
+
+    @Override
+    public ServiceResponse<List<ProvinceDTO>> queryProvinces(String search) {
+        return ServiceResponse.success(EntityUtil.changeEntityListByJSON(ProvinceDTO.class, this.provincesService.queryProvinces(search)));
+    }
+
+    @Override
+    public ServiceResponse<List<CityDTO>> queryCity(String search) {
+        return ServiceResponse.success(EntityUtil.changeEntityListByJSON(CityDTO.class, this.queryCity(search)));
+    }
+
+    @Override
+    public ServiceResponse<List<CountyDTO>> queryCounty(String search) {
+        return ServiceResponse.success(EntityUtil.changeEntityListByJSON(CountyDTO.class, this.provincesService.queryCounty(search)));
+    }
 }

gic-store-service/src/main/java/com/gic/store/service/outer/StoreDictApiServiceImpl.java

 package com.gic.store.service.outer;
 
+import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.bizdict.api.dto.BizdictDTO;
 import com.gic.bizdict.api.service.BizdictService;
 import com.gic.store.dto.StoreDictDTO;
 import com.gic.store.entity.TabStoreDict;
+import com.gic.store.entity.TabStoreField;
 import com.gic.store.service.StoreDictApiService;
 import com.gic.store.service.StoreDictService;
+import com.gic.store.service.StoreFieldService;
 import com.gic.store.utils.ErrorCode;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,6 +25,8 @@ public class StoreDictApiServiceImpl implements StoreDictApiService {
     private StoreDictService storeDictService;
     @Autowired
     private BizdictService bizdictService;
+    @Autowired
+    private StoreFieldService storeFieldService;
 
     @Override
     public ServiceResponse<List<StoreDictDTO>> listAllStoreType(Integer enterpriseId) {
@@ -91,6 +96,33 @@ public class StoreDictApiServiceImpl implements StoreDictApiService {
         return ServiceResponse.success();
     }
 
+    @Override
+    public ServiceResponse<List<StoreDictDTO>> listStoreField(Integer enterpriseId) {
+        List<StoreDictDTO> result = new ArrayList<>();
+        com.github.pagehelper.Page<TabStoreField> listStoreField = this.storeFieldService.listStoreField(enterpriseId, null, 1, 1000);
+        if(listStoreField != null){
+            List<TabStoreField> list = listStoreField.getResult();
+            List<String> listSelect = this.storeDictService.listStoreField(enterpriseId);
+            for(TabStoreField tabStoreField : list){
+                StoreDictDTO storeDictDTO = new StoreDictDTO();
+                storeDictDTO.setKey(tabStoreField.getStoreFieldName());
+                storeDictDTO.setValue(tabStoreField.getStoreFieldId()+"");
+                for(String s : listSelect){
+                    if(tabStoreField.getStoreFieldId() == Integer.valueOf(s)){
+                        storeDictDTO.setChecked(1);
+                    }
+                }
+                result.add(storeDictDTO);
+            }
+        }
+        return ServiceResponse.success(result);
+    }
+
+    @Override
+    public ServiceResponse saveStoreField(Integer enterpriseId, String value) {
+        return null;
+    }
+
     private List<StoreDictDTO> listAllStoreDict(Integer enterpriseId, String type){
         List<StoreDictDTO> result = new ArrayList<>();
         List<BizdictDTO> list = this.bizdictService.treeByCategoryCode(type);

gic-store-service/src/main/resources/mapper/TabCityMapper.xml

@@ -109,4 +109,12 @@
     <include refid="Base_Column_List" />
     from tab_city
   </select>
+  <select id="queryCity"  resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from tab_county where 1=1
+    <if test="search != null and search != ''">
+      and city_name like concat('%',#{search}, '%')
+    </if>
+  </select>
 </mapper>
\ No newline at end of file

gic-store-service/src/main/resources/mapper/TabCountyMapper.xml

@@ -132,4 +132,13 @@
     <include refid="Base_Column_List" />
     from tab_county
   </select>
+
+  <select id="queryCounty"  resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from tab_county where 1=1
+    <if test="search != null and search != ''">
+      and county_name like concat('%',#{search}, '%')
+    </if>
+  </select>
 </mapper>
\ No newline at end of file

gic-store-service/src/main/resources/mapper/TabProvinceMapper.xml

@@ -96,4 +96,13 @@
     <include refid="Base_Column_List" />
     from tab_province
   </select>
+  <select id="queryProvinces"  resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from tab_province where 1=1
+    <if test="search != null and search != ''">
+      and province_name like concat('%',#{search}, '%')
+    </if>
+  </select>
+
 </mapper>
\ No newline at end of file

gic-store-service/src/main/resources/mapper/TabStoreDictMapper.xml

@@ -115,4 +115,11 @@
     from tab_store_dict
     where enterprise_id = #{enterpriseId,jdbcType=INTEGER} and type='storeStatus'
   </select>
+
+  <select id="listStoreField" parameterType="java.lang.Integer" resultType="java.lang.String">
+    select
+    value
+    from tab_store_dict
+    where enterprise_id = #{enterpriseId,jdbcType=INTEGER} and type='storeField'
+  </select>
 </mapper>
\ No newline at end of file