门店品牌变更

gic-store-api/src/main/java/com/gic/store/dto/StoreSearchDTO.java

@@ -43,6 +43,7 @@ public class StoreSearchDTO implements Serializable {
     private String storeStatuss;
     private String realStatuss;
     private String storeTags;
+    private String storeBrandIds;
 
     public Integer getStoreGroupId() {
         return storeGroupId;
@@ -302,6 +303,14 @@ public class StoreSearchDTO implements Serializable {
         this.storeInfoIdsOfNot = storeInfoIdsOfNot;
     }
 
+    public String getStoreBrandIds() {
+        return storeBrandIds;
+    }
+
+    public void setStoreBrandIds(String storeBrandIds) {
+        this.storeBrandIds = storeBrandIds;
+    }
+
     @Override
     public String toString() {
         return "StoreSearchDTO{" +
@@ -318,6 +327,7 @@ public class StoreSearchDTO implements Serializable {
                 ", storeIds='" + storeIds + '\'' +
                 ", storeInfoIds='" + storeInfoIds + '\'' +
                 ", storeIdsOfNot='" + storeIdsOfNot + '\'' +
+                ", storeInfoIdsOfNot='" + storeInfoIdsOfNot + '\'' +
                 ", storeBrandId=" + storeBrandId +
                 ", searchJson='" + searchJson + '\'' +
                 ", authSearchJson='" + authSearchJson + '\'' +
@@ -336,6 +346,7 @@ public class StoreSearchDTO implements Serializable {
                 ", storeStatuss='" + storeStatuss + '\'' +
                 ", realStatuss='" + realStatuss + '\'' +
                 ", storeTags='" + storeTags + '\'' +
+                ", storeBrandIds='" + storeBrandIds + '\'' +
                 '}';
     }
 }

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

@@ -68,4 +68,16 @@ public interface StoreTagApiService {
      * @throws
      */
     ServiceResponse<List<StoreTagDTO>> listByEnterprise(Integer enterpriseId);
+
+    /**
+     * listByEnterprise 
+     * @Title: listByEnterprise
+     * @Description: 
+     * @author taogs 
+     * @param enterpriseId
+     * @param search
+     * @return com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.store.dto.StoreTagDTO>>
+     * @throws 
+     */
+    ServiceResponse<List<StoreTagDTO>> listByEnterprise(Integer enterpriseId, String search);
 }

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

@@ -58,9 +58,10 @@ public interface TabStoreTagMapper {
      * @Title: listByEnterprise
      * @Description: 
      * @author zhiwj 
- * @param enterpriseId
+     * @param enterpriseId
+     * @param search
      * @return java.util.List<com.gic.store.entity.TabStoreTag>
      * @throws 
      */
-    List<TabStoreTag> listByEnterprise(@Param("enterpriseId") Integer enterpriseId);
+    List<TabStoreTag> listByEnterprise(@Param("enterpriseId") Integer enterpriseId, @Param("search") String search);
 }
\ No newline at end of file

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

@@ -53,8 +53,9 @@ public interface StoreTagService {
      * @Description:
      * @author zhiwj
      * @param enterpriseId
+     * @param search
      * @return java.util.List<com.gic.store.entity.TabStoreTag>
      * @throws
      */
-    List<TabStoreTag> listByEnterprise(Integer enterpriseId);
+    List<TabStoreTag> listByEnterprise(Integer enterpriseId, String search);
 }

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

@@ -46,7 +46,7 @@ public class StoreTagServiceImpl implements StoreTagService{
     }
 
     @Override
-    public List<TabStoreTag> listByEnterprise(Integer enterpriseId) {
-        return tabStoreTagMapper.listByEnterprise(enterpriseId);
+    public List<TabStoreTag> listByEnterprise(Integer enterpriseId, String search) {
+        return tabStoreTagMapper.listByEnterprise(enterpriseId, search);
     }
 }

gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreApiServiceImpl.java

@@ -1741,7 +1741,7 @@ public class StoreApiServiceImpl implements StoreApiService {
         json = buildOtherField(storeSearchDTO, jsonObjectList, json);
         if(StringUtils.isNotBlank(storeSearchDTO.getStoreTags())){
             String[] arr = storeSearchDTO.getStoreTags().split(",");
-            List<TabStoreTag> storeTags = this.storeTagService.listByEnterprise(storeSearchDTO.getEnterpriseId());
+            List<TabStoreTag> storeTags = this.storeTagService.listByEnterprise(storeSearchDTO.getEnterpriseId(), null);
             List<Integer> storeWidgetList = storeTags.stream().filter(tag -> {
                 for (String s : arr) {
                     if (tag.getStoreTagId() == Integer.parseInt(s)) {
@@ -1862,6 +1862,10 @@ public class StoreApiServiceImpl implements StoreApiService {
             json = QueryConditionAssemblyUtil.createSimpleQueryNode(StoreESFieldsEnum.REALSTATUS.getField(), OperateEnum.OPERATE_ARR_CONTAIN, storeSearchDTO.getRealStatuss());
             jsonObjectList.add(json);
         }
+        if(StringUtils.isNotBlank(storeSearchDTO.getStoreBrandIds())){
+            json = QueryConditionAssemblyUtil.createSimpleQueryNode(StoreESFieldsEnum.STOREBRANDIDLIST.getField(), OperateEnum.OPERATE_ARR_CONTAIN, storeSearchDTO.getStoreBrandIds());
+            jsonObjectList.add(json);
+        }
         return json;
     }
 

gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreTagApiServiceImpl.java

@@ -89,7 +89,13 @@ public class StoreTagApiServiceImpl implements StoreTagApiService{
 
     @Override
     public ServiceResponse<List<StoreTagDTO>> listByEnterprise(Integer enterpriseId) {
-        List<TabStoreTag> list = storeTagService.listByEnterprise(enterpriseId);
+        List<TabStoreTag> list = storeTagService.listByEnterprise(enterpriseId, null);
+        return ServiceResponse.success(EntityUtil.changeEntityListNew(StoreTagDTO.class, list));
+    }
+
+    @Override
+    public ServiceResponse<List<StoreTagDTO>> listByEnterprise(Integer enterpriseId, String search) {
+        List<TabStoreTag> list = storeTagService.listByEnterprise(enterpriseId, search);
         return ServiceResponse.success(EntityUtil.changeEntityListNew(StoreTagDTO.class, list));
     }
 }

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

@@ -117,7 +117,9 @@
     from tab_store_tag
     where delete_flag = 0
     and enterprise_id = #{enterpriseId}
-
+    <if test="search != null and search != ''">
+      and store_tag_name like concat('%',#{search}, '%')
+    </if>
     order by update_time desc
   </select>
 </mapper>
\ No newline at end of file