Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-data-cloud into developer

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/MemberCloudDataController.java

 package com.gic.cloud.web.controller;
 
+import com.gic.data.api.qo.member.MemberPortraitQO;
 import com.gic.data.api.qo.member.MemberRecruitAreaQO;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -36,7 +37,6 @@ public class MemberCloudDataController {
     @RequestMapping("get-member-distribution-trend")
     public RestResponse queryMemberDistributionTrend(MemberDistributionTrendQO params) {
         log.info("会员分布-趋势参数：{}", JSON.toJSONString(params));
-        params.setOnlineStoreIdList(storeSearchUtils.onLineStoreSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()));
         params.setStoreInfoIdList(storeSearchUtils.storeSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()));
         params.setMemberCardIdList(dataAuthUtils.getMbrAreaId(params.getUserId(), params.getEnterpriseId()));
         return ResultControllerUtils.commonResult(memberCloudDataApiService.queryMemberDistributionTrend(params));
@@ -45,7 +45,6 @@ public class MemberCloudDataController {
     @RequestMapping("get-member-distribution-area")
     public RestResponse pageMemberDistributionArea(MemberDistributionAreaQO params) {
         log.info("会员分布-区域参数：{}", JSON.toJSONString(params));
-        params.setOnlineStoreIdList(storeSearchUtils.onLineStoreSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()));
         params.setStoreInfoIdList(storeSearchUtils.storeSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()));
         if (params.getLevel() == null) {
             params.setLevel(storeSearchUtils.getLevel(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()).getLevel());
@@ -58,7 +57,6 @@ public class MemberCloudDataController {
     @RequestMapping("get-member-recruit-area")
     public RestResponse pageMemberRecruitArea(MemberRecruitAreaQO params) {
         log.info("会员招募-区域参数：{}", JSON.toJSONString(params));
-        params.setOnlineStoreIdList(storeSearchUtils.onLineStoreSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()));
         params.setStoreInfoIdList(storeSearchUtils.storeSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()));
         if (params.getLevel() == null) {
             params.setLevel(storeSearchUtils.getLevel(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()).getLevel());
@@ -68,5 +66,13 @@ public class MemberCloudDataController {
         return ResultControllerUtils.commonResult(memberCloudDataApiService.pageMemberRecruitArea(params));
     }
 
+    @RequestMapping("get-member-portrait")
+    public RestResponse queryMemberBasicPortrait(MemberPortraitQO params) {
+        log.info("会员基础画像参数：{}", JSON.toJSONString(params));
+        params.setStoreInfoIdList(storeSearchUtils.storeSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()));
+        params.setMemberCardIdList(dataAuthUtils.getMbrAreaId(params.getUserId(), params.getEnterpriseId()));
+        return ResultControllerUtils.commonResult(memberCloudDataApiService.queryMemberBasicPortrait(params));
+    }
+
 
 }