Merge branch 'feature-2023-05' into developer

# Conflicts:
#	gic-cloud-data-hook-service/src/test/java/com/gic/QueryFilterTest.java

gic-cloud-data-hook-api/src/main/java/com/gic/cloud/data/hook/api/enums/QueryFilterCodeEnum.java

@@ -9,6 +9,7 @@ public enum QueryFilterCodeEnum {
     STORE_CODE_NO_PAGE("storeCodeNoPage","门店编号筛选"),
     STORE_NAME_NO_PAGE("storeNameNoPage","门店名称筛选"),
     STORE_GROUP_NAME("storeGroupName","门店分组筛选"),
+    GRADE("grade","会员等级"),
     ;
     private String code;
     private String name;

gic-cloud-data-hook-service/pom.xml

@@ -214,6 +214,11 @@
 			<artifactId>gic-clerk-api</artifactId>
 			<version>${gic-clerk-api}</version>
 		</dependency>
+		<dependency>
+			<groupId>com.gic</groupId>
+			<artifactId>gic-member-api</artifactId>
+			<version>${gic-member-api}</version>
+		</dependency>
 	</dependencies>
 
 	<build>

gic-cloud-data-hook-service/src/main/java/com/gic/cloud/data/hook/service/deal/queryfilter/MemberGradeNameQueryFilter.java

+package com.gic.cloud.data.hook.service.deal.queryfilter;
+
+import com.gic.api.base.commons.Page;
+import com.gic.clerk.api.dto.ClerkDTO;
+import com.gic.clerk.api.service.ClerkService;
+import com.gic.cloud.data.hook.api.dto.FilterQueryDataDTO;
+import com.gic.cloud.data.hook.api.enums.QueryFilterCodeEnum;
+import com.gic.cloud.data.hook.service.deal.BaseQueryFilter;
+import com.gic.cloud.data.hook.service.deal.QueryFilterContext;
+import com.gic.cloud.data.hook.service.entity.QueryFilterInfo;
+import com.gic.member.api.dto.GradeBaseDTO;
+import com.gic.member.api.service.GradeService;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+public class MemberGradeNameQueryFilter implements BaseQueryFilter {
+
+    @Autowired
+    private GradeService gradeService;
+
+    @Override
+    public boolean checkFilter(QueryFilterContext context) {
+        QueryFilterInfo queryFilterInfo = context.getQueryFilterInfo();
+        if (null == queryFilterInfo||queryFilterInfo.getFilterCode()==null) {
+            return false;
+        }
+        return queryFilterInfo.getFilterCode().equals(QueryFilterCodeEnum.GRADE.getCode());
+    }
+
+    @Override
+    public Page<FilterQueryDataDTO> pageQueryData(QueryFilterContext context) {
+        List<GradeBaseDTO> gradeDTOList = gradeService.getGradeDTOList(context.getEnterpriseId());
+
+        Page<FilterQueryDataDTO> ret =new Page<>();
+        ret.setPageSize(context.getPageSize());
+        ret.setCurrentPage(context.getPageNum());
+        ret.setTotalCount(gradeDTOList.size());
+
+        List<FilterQueryDataDTO> retList = gradeDTOList.stream().map(mid -> {
+            FilterQueryDataDTO filterQueryDataDTO = new FilterQueryDataDTO();
+            filterQueryDataDTO.setShowName(mid.getGradeName());
+            filterQueryDataDTO.setItemValue(mid.getGradeName());
+            filterQueryDataDTO.setSubShowName(mid.getGradeName());
+            return filterQueryDataDTO;
+        }).collect(Collectors.toList());
+        ret.setResult(retList);
+        return ret;
+    }
+
+    @Override
+    public List<FilterQueryDataDTO> listBackByItems(QueryFilterContext context) {
+        List<GradeBaseDTO> gradeDTOList = gradeService.getGradeDTOList(context.getEnterpriseId());
+        if (CollectionUtils.isEmpty(gradeDTOList)) {
+            return null;
+        }
+        List<FilterQueryDataDTO> retList = gradeDTOList.stream().map(mid -> {
+            FilterQueryDataDTO filterQueryDataDTO = new FilterQueryDataDTO();
+            filterQueryDataDTO.setShowName(mid.getGradeName());
+            filterQueryDataDTO.setItemValue(mid.getGradeName());
+            filterQueryDataDTO.setSubShowName(mid.getGradeName());
+            return filterQueryDataDTO;
+        }).collect(Collectors.toList());
+        return retList;
+    }
+}

gic-cloud-data-hook-service/src/main/resources/data-hook-service-dubbo-config.xml

@@ -40,6 +40,7 @@
     <dubbo:reference interface="com.gic.clerk.api.service.ClerkService" id="clerkService" timeout="10000" />
     <dubbo:reference interface="com.gic.enterprise.api.service.StoreService" id="storeService" timeout="10000" />
     <dubbo:reference interface="com.gic.enterprise.api.service.StoreGroupService" id="storeGroupService" timeout="10000" />
+    <dubbo:reference interface="com.gic.member.api.service.GradeService" id="gradeService" timeout="10000" />
 
     <!-- 引用的 Dubbo 服务 -->
     <!--<dubbo:reference interface="com.gic.dict.api.service.ManagerDictService" id="managerDictService" timeout="10000" />

gic-cloud-data-hook-service/src/test/java/com/gic/QueryFilterTest.java

@@ -30,7 +30,7 @@ public class QueryFilterTest {
     @Test
     public void test(){
         QueryFilterContext queryFilterContext = new QueryFilterContext();
-        DhFlatQueryFilter dhFlatQueryFilter = dhFlatQueryFilterMapper.selectByPrimaryKey(1L);
+        DhFlatQueryFilter dhFlatQueryFilter = dhFlatQueryFilterMapper.selectByPrimaryKey(46L);
         if (null  == dhFlatQueryFilter) {
             return;
         }